![]() You can see that the sample.txt file is in conflict – the little red icon next to the file name indicates the conflict status. Now the Git pane is in “Rebase Interactive” mode. While still on the master branch, click on Rebase in the Git pane, and select the feature1 local branch as the source for the rebase operation. Let’s see what happens when we try to rebase. You can read this excellent tutorial about the differences between merge and rebase. There are 2 ways in which we can do this: rebase and merge. Let’s assume that we want to incorporate the changes done in the feature1 branch to the master branch. Let’s recap… you modified the same code line in the same file but in two different branches and committed these changes to Git.
0 Comments
Leave a Reply. |