Git Merge Rebase and Cherry Pick - deep dive
Hello guys 🙂 this post I would like to share with you about the " git merge " experiments. We have multiple code lines in the project, once the developer completes his task branch is ready to move to the next branch for testing. Git Merge and git rebase There are multiple ways to combine the code lines. If the HEAD pointed to the tip of the branch then the best way to merge from the other branches into the current branch. FF fast forward merge 3 Way merge You will be on the target-branch (most of the time it will be main/master or release or production) and then you will run the following command with a source-branch. git merge [branch-name] The following example for the Git Merge 'ort' Strategy, let's begin clear mkdir merge_test; cd merge_test; git init # on main branch two commits touch test1 ; git add . ; git commit -m "test1" touch test2 ; git add . ; git commit -m "test2" # branch out feature and do 2 commits git chec...