On Thu, Dec 09, 2010 at 10:27:56PM +0100, Johanna Ploog wrote: > I've seen and resolved conflicts before, but never ones as complicated > as this one. > > Commit b03ab3ea introduced a load of spacing fixes [*] in a file I was > working on. Unfortunately, I had already made three local commits to > said file which git was unable to merge into master, so I ended up in > a local branch of my own, with no clue how to get things working > again. > > After lots of hair-pulling and gnashing of teeth (read: several > frustrating attempts to resolve this conflict, each one less > successful than the last), I finally ended up doing what I would have > done in svn: somehow by trial and error return to the state before the > checkout, copy all my modified files elsewhere, skip over any > troublesome patch during checkout (all three of them) and copy my > modified files back into the now up-to-date master. This kind of > brute-force manoeuvre seems kinda at odds with git's general > behaviour, so there's probably a neat and elegant solution out there. > > Thus I ask you git gurus: What would have been the *correct* steps to > resolve such a conflict?
Were you using git pull or git pull --rebase? git pull (without --rebase) is much better at doing automatic merges. After a failed rebase, use git rebase --abort to return to a sane state. -sorear
signature.asc
Description: Digital signature
------------------------------------------------------------------------------
_______________________________________________ Crawl-ref-discuss mailing list Crawl-ref-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/crawl-ref-discuss
