|Merge "using strategy resolve resulted in: Failed." [message #711151]
||Fri, 05 August 2011 16:36
Registered: August 2011
I have a workspace with nothing in the working directory and one commit. This commit is a single file which conflicts with the remote's head.|
(git status) reports:
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 74 different commit(s) each, respectively.
nothing to commit (working directory clean)
I tried to use EGit to merge using Team menu item, Merge item, Remote Tracking folder, origin/master (Ref), Merge button. I get the following error in a new window:
Multiple problems have occurred
(X) Merge of revisions abc..., 123..., with base def..., using strategy resolve resulted in: Failed. (hereafter known as (the same error message))
The white box in the window says:
(the same error message)
Merging with refs/remotes/origin/master
and the Details view shows (the same error message).
In Event Details, it shows the Date, the Severity is an Error, the Message is (the same error message), Exception Stack Trace is not available.
java.vendor=Sun Microsystems Inc.
BootLoader constants: OS=win32, ARCH=x86, WS=win32, NL=en_US
Command-line arguments: -os win32 -ws win32 -arch x86
How do I get EGit to show me a 3-way merge for the conflicting, committed file?