Go to Visual Studio > Team Explorer > Changes > Conflicts
Click each conflict and click MERGE button.
Resolve (left side) by adding both changes.
Click "Accept Merge" top left.
Conflicts are resolved.
Go to SourceTree. Will not be on a branch. Stage all changes.
> Terminal > git rebase --continue
This will finish rebase and go to correct branch. If all looks good, then do a final push:
> Terminal > git push -f origin feature/3100_NewFeatureBranch
No comments:
Post a Comment