On 9 December 2010 23:15, Adam Borowski <kilob...@angband.pl> wrote: > 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. > > Whoops, sorry.
Never mind, it worked out in the end. You're forgiven. :) >> 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. > > If you have problems of this kind you are unable to fix, please push it to a > temp branch: git push sf master:my_new_temp_branch, and tell us about this. That works? I've been wondering about that. > In most cases, the blocks will be relatively short, but sometimes things may > indeed get convoluted. In such cases, I noticed that "patch" can often get > better results than git's patching. > > Also, this particular problem could be dealt with by "patch -l" which does > exactly what we'd want here. I'm not sure if --ignore-whitespace in git > itself would do this (literal reading of the docs say no) so you'd have to > use "git diff" then "patch" by hand. That might have been worth trying. Only: how would I have got my hands on the commit patch in the first place? Thanks, Johanna ------------------------------------------------------------------------------ Oracle to DB2 Conversion Guide: Learn learn about native support for PL/SQL, new data types, scalar functions, improved concurrency, built-in packages, OCI, SQL*Plus, data movement tools, best practices and more. http://p.sf.net/sfu/oracle-sfdev2dev _______________________________________________ Crawl-ref-discuss mailing list Crawl-ref-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/crawl-ref-discuss
