Eclipse Community Forums - RDF feed
https://www.eclipse.org/forums/
Eclipse Community ForumsCannot merge now
https://www.eclipse.org/forums/index.php/mv/msg/489653/1065878/#msg_1065878
I get an error when trying to merge. The error is "Cannot merge now".
When can egit merge?
Also, when I bring up the context menu - Team > Merge - merge is greyed out.
What is the problem here?
]]>Anton Hughes2013-06-28T06:57:21-00:00Re: Cannot merge now
https://www.eclipse.org/forums/index.php/mv/msg/489653/1065967/#msg_1065967
Christian Halstrick2013-06-28T13:59:23-00:00Re: Cannot merge now
https://www.eclipse.org/forums/index.php/mv/msg/489653/1066007/#msg_1066007
Because, again, I have just done fetch from upstream. Eclipse does not show anything about any conflicts, and I am unable to do a merge.]]>Anton Hughes2013-06-28T19:30:52-00:00Re: Cannot merge now
https://www.eclipse.org/forums/index.php/mv/msg/489653/1066391/#msg_1066391
http://tinypic.com/view.php?pic=2hz278z&s=5
]]>Christian Halstrick2013-07-02T12:13:27-00:00