Hello everyone!
Today, I tried both fast-forward and three-way recursive merges as I was working on two different additional features for my SSG command-line tool, SSGulnur.
First feature that I was interested in implementing was adding markdown bold and link syntax features support. As always, I created an issue about my solution and a branch in which I worked on it.
I also followed the same steps for my second feature which was adding markdown heading syntax features support.
I worked on them one by one. So, after I had been satisfied with my new code in one branch, I would commit it with a descriptive name stating which issue would get fixed and then switch into another branch and do the same. At the end though I had to combine all of them together. Therefore, I went back to my main and started merging the new branches one by one. The first one went smoothly through a fast-forward merge, but the second one was a three-way recursive merge and required me to resolve the conflicts, as I worked on the same lines of code in both of them. I combined the code accepting both and committed the changes.
When, I pushed my updates back into the GitHub, I could see that the issues were closed and also contained the commit references automatically for me, as I used fixes #(issue number) in my commit descriptions.
For my first issue the commit number was 1d14563 and or my second issue it was f966533.
Probably, this ability to have many simultaneous branches is very useful when multiple developers are working on the same code, but it still helps to combine the code even if you are working alone and want to split some project implementations.
Overall, great.
Top comments (0)