Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » Best way to fix merges
Best way to fix merges [message #646771] Thu, 30 December 2010 23:57
Miles Parker is currently offline Miles ParkerFriend
Messages: 1341
Registered: July 2009
Senior Member
I've gotten myself into the following bind a few times and it is quite frustrating as I can't seem to figure out a good way out short of completely reconstructing the git repos.

When doing a merge, I end up with a state where the merge characters, i.e. "<<<<<<< HEAD" end up in the repository -- probably something I've screwed up there -- but when I try to fix it with a local change and commit, the commit says that there aren't any changed selections. This is sort of the worst of both worlds, given that new fetches are getting the text with the merge markers, but as far as the local version is concerned, those merged changes don't exist. How do I resolve this?

thanks,

Miles
Previous Topic:Installs but no sign of Egit
Next Topic:New to JGit - need to embed git control in application
Goto Forum:
  


Current Time: Tue Jul 25 20:57:29 GMT 2017

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

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