You could try [1] : git merge -s recursive -Xignore-space-change <name of branch to merge>
If the merge goes bad, you can always do a hard reset back to the current (apache remote) HEAD: git reset --hard <apache remote SHA> [1] http://stackoverflow.com/questions/5256769/git-merge-and-fixing-mixed-spaces-and-tabs-with-two-branches On Thu, Jun 7, 2012 at 7:59 AM, Joe Bowser <[email protected]> wrote: > On Thu, Jun 7, 2012 at 6:31 AM, Simon MacDonald > <[email protected]>wrote: > > > Dude, you told me to merge the death to tabs commit so don't complain :) > > > > > It shows that I had a misunderstanding of how Git handles such things. For > some reason I didn't think changing tabs to spaces would confuse it and > cause me to have to walk through the code and redo a merge I already did. > I know, totally crazy-talk, right? > > (Note: I'm sure there's a setting to get git to ignore whitespace, but I > have no idea what that is, or whether we want that turned on). > > > > Yes, I think we should tag the head with a non-CordovaWebView tag. > > Like you said if we need to cut an emergency 1.8.1 release it will be > > much easier. > > > > > So, I'm going to call the tag 1.8.1-pre, just so it's clear why it exists. > Sound good? > > Joe >
