Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » Best way to fix merges
Best way to fix merges [message #646771] Thu, 30 December 2010 18:57
Miles Parker is currently offline Miles Parker
Messages: 1338
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:How to change the location of ".gitconfig" under Windows?
Next Topic:Difference for commit between files, index and tracked.
Goto Forum:
  


Current Time: Fri Aug 29 06:13:34 EDT 2014

Powered by FUDForum. Page generated in 0.02085 seconds