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.
Online forums and learning are now in one easy-to-use experience.
By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.