You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
I am not a Git Guru by anymeans but up until now I have been using TortoiseGit. I continue to do so on occasion.
But I wanted to be clear about merging branches. In TortoiseGit I right-click and choose the option to Merge and this popup is displayed:
I always tick the No Fast Forward option and leave the Merge Message as the default. When I check the TortoiseGit log afterwards I can see the merged branch:
I can now check in SourceTree and it looks the same (as you would exspect):
Now, lets just go back to the point before I hard merged the branch. This si what it looked like in SourceTree:
When I right-click the branch and choose the option to merge it, the following is displayed:
This is why I stopped and ended up using TortoiseGit to merge. How do I ensure it will merge in the same way (no fast forward)? I ask because sometimes in the past I merged and did not have that option ticked and it merged as a single commit, which I did not want.