On 9 December 2010 23:17, Stefan O'Rear <stefa...@cox.net> wrote: > On Thu, Dec 09, 2010 at 10:27:56PM +0100, Johanna Ploog wrote: >> 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. >> >> 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?
I've got "rebase" added to my global configs because I was told that pulling w/o --rebase had some bad side effects I've forgotten, and I tend to forget about these parameters and only remember belatedly that I should have added them. > git pull (without --rebase) is much better at doing automatic merges. I see. So git pull --no-rebase would override my config setting. Interesting... > After a failed rebase, use git rebase --abort to return to a sane state. All right, that's probably what I ended up doing. 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
