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? Thanks in advance, Johanna *) Apparently, when I updated my editor today, all my settings (specifically, tab/spacing ones) were reset to default, which I only noticed when the above problem occurred. Bad timing, all around. :( ------------------------------------------------------------------------------ _______________________________________________ Crawl-ref-discuss mailing list Crawl-ref-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/crawl-ref-discuss
