| Stash complains of merge conflict - how to resolve this in egit? [message #1724907] |
Sat, 27 February 2016 00:09  |
 Dave Banty
Messages: 10
Registered: February 2016 |
Junior Member |
|
|
I created a pull request in Stash to test merge conflicts. I got the following:
Quote:
Issues Merging the Pull Request Close
Merge conflict
This pull request has conflicts. You must resolve the conflicts before you can merge:
Step 1: Fetch the changes (saving the target branch as FETCH_HEAD).
git fetch origin master
Step 2: Checkout the source branch and merge in the changes from the target branch. Resolve conflicts.
git checkout bugfix/blah2
git merge FETCH_HEAD
Step 3: After the merge conflicts are resolved, stage the changes accordingly, commit the changes and push.
git commit
git push origin HEAD
Step 4: Merge the updated pull request.
I am confused on how to do this inside Eclipse in egit. I have my current branch checkout out in the workspace, but I can't see how to merge changes from master into my curent branch to resolve the conflict, and then to try the merge back into master again?
[Updated on: Sat, 27 February 2016 00:10] Report message to a moderator |
|
|
|
|
Powered by
FUDForum. Page generated in 0.02807 seconds
] 
Search
Help
Register
Login
Home
