Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » Stash complains of merge conflict - how to resolve this in egit?
Stash complains of merge conflict - how to resolve this in egit? [message #1724907] Sat, 27 February 2016 00:09 Go to next message
Dave Banty is currently offline Dave BantyFriend
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

Re: Stash complains of merge conflict - how to resolve this in egit? [message #1724930 is a reply to message #1724907] Sat, 27 February 2016 10:18 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 1058
Registered: July 2009
Senior Member
- checkout the branch which should receive the merge commit
- there are several ways to start a merge [1], I recommend to start it from history view:
in history view select the branch you want to merge
- click "Merge"
- if there are conflicts resolve them [2]
- push checked out branch to target branch in the remote repository:
e.g. select the repository in repositories view and click "Push branch <branch name>"

[1] https://wiki.eclipse.org/EGit/User_Guide#Merging_a_branch_or_a_tag_into_the_current_branch
[2] https://wiki.eclipse.org/EGit/User_Guide#Resolving_a_merge_conflict
Re: Stash complains of merge conflict - how to resolve this in egit? [message #1724977 is a reply to message #1724930] Sun, 28 February 2016 12:37 Go to previous message
Dave Banty is currently offline Dave BantyFriend
Messages: 10
Registered: February 2016
Junior Member
Perfect, thanks Matthias!
Previous Topic:Double click in staging view doesn't open compare editor any more
Next Topic:how do i update my workspace in eclipse after switching branches
Goto Forum:
  


Current Time: Wed May 22 00:33:47 GMT 2019

Powered by FUDForum. Page generated in 0.02616 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top