Closed mepox closed 2 years ago
@mepox please pull changes from main
and merge main
into your local copy of the branch issue-145
you're pushing here
You may have to resolve some conflicts, and some of your tests will probably fail due to the nature of these latest changes, see #157.
That was an interesting merge, I thought it will only commit the "Merge branch..." but re-commited again my previous commits? Or is this normal? I am not a Git expert.
I'm also learning more about Git workflows as we progress in these latest PRs. I've only used the common merge strategy before. @mepox Your duplicate commits are a result of me squash-merging some PRs to help keep the main commit history tidy. Yet, the result of this experiment ends up a little ugly if not handled with utmost care 😅
If you want to, you can start over the PR to make it easier. Fortunately for you, your changes are quite simple. You would simply have to:
ProfileServiceImplTest
class and the CHANGELOG
note (e.g. copy them outside the repo folder)main
main
, pour the changes you backed up and commit themOtherwise, if you're not feeling like doing all that, I'm probably squash-merging this PR too to get rid of those pesky duplicate commits 😂
Thanks @bglamadrid , I thought about creating a new PR as a last resort 😄 I was experimenting with Git a bit. I managed to clean up and squash commits... I think 😄
Kudos, SonarCloud Quality Gate passed!
0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells
No Coverage information
0.0% Duplication
I wanted to experiment with Git for learning purpose (to able to resolve the mess when needed..). I think this PR is ready now 😄 Please review.
@bglamadrid Of course, let me know if you still want me to create a new clean PR instead.
PR Checklist
mvn test
returns exit code 0, without errors)PR Type
Summary
Add unit tests for
ProfileServiceImpl