Similar to yesterday’s tip, but today, you’ll see how to resolve a conflict when rebasing within Visual Studio.
Suppose you have the same line in the same file modified in different branches. Just something simple to trigger a merge conflict. Or more likely, you’ve added one file in master and you’ve added another file in an experiment branch. Then you get a conflict when rebasing because your project file needs help merging the two newly added files.
First, you’ll get the message that there are conflicts.
Click on the Conflicts: 1 link.
Clicking on the Merge button will bring up the built-in merge tool.
Make whatever selections you want, and then hit Accept Merge.
Now View Changes, as you’ve resolved the conflicts, but still need to finish the rebase.
And finally finish the rebase! (For some reason, I can’t stop hearing the Mortal Kombat game in my head.)
And now you’ll see that the experiment branch has been merged onto master.