From: Giuseppe Bilotta Date: Tue, 30 Jun 2009 09:18:53 GMT Subject: Re: Merge, rebase and whitespace fixes Message-ID: In-Reply-To: <4A49D4C5.8090700@dawes.za.net> On Tue, Jun 30, 2009 at 11:03 AM, Rogan Dawes wrote: >> I tried doing the whitespace cleanup on top of the last patch, but the >> merge still conflicted. >> >> The interesting thing is that there's patchset from Robert Fitzsimons >> that goes back to August 2005 (!) that does a couple of git apply >> cleanups and in particular adds the --ignore-whitespace option that I >> would need ... >> >> http://permalink.gmane.org/gmane.comp.version-control.git/7876 >> >> but the patch apparently never made it into mainline ... >> > > One thing I have done in the past when trying to merge two diverged > trees was to format each commit in each tree to a common standard. > > One of the ways in which the trees had diverged was whitespace > (non-meaningful) changes, so I used the Eclipse formatter as part of a > "git filter-branch" script to make sure that I was ony looking at > meaningful changes between the trees at each point. This significantly > simplified the process. I can also reply all the patches manually, of course, but the question is: why should I be doing something manually when it can be done programmatically? BTW, I tried updating Robert's patch to the new code base, but it's WAY too different ... -- Giuseppe "Oblomov" Bilotta