{"thread":{"id":"19967","subject":"Merge, rebase and whitespace fixes","startedAt":"2009-06-29T19:18:36Z","lastAt":"2009-06-30T09:18:53Z","messageCount":5,"participants":["Giuseppe Bilotta","Rogan Dawes"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"117174","messageId":"cb7bb73a0906291218m3ba43109s35cad87efc5161a7@mail.gmail.com","threadId":"19967","inReplyTo":null,"subject":"Merge, rebase and whitespace fixes","fromName":"Giuseppe Bilotta","fromEmail":"giuseppe.bilotta@gmail.com","sentAt":"2009-06-29T19:18:36Z","receivedAt":"2009-06-29T19:18:36Z","isPatch":false,"sender":{"key":"giuseppe.bilotta@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1464?v=4"},"body":"Hello all,\n\nrecently a tree I've been working on received some thorough whitespace\nadjustments (changing indents from spaces to tabs). This results in\nannoying conflicts when running merges or rebases with my local\nbranches. I tried googling around but I couldn't find any helpful\nhints on how to make git cope with this. Any suggestions?\n\n-- \nGiuseppe \"Oblomov\" Bilotta\n"},{"id":"117181","messageId":"4A493287.20106@dawes.za.net","threadId":"19967","inReplyTo":"cb7bb73a0906291218m3ba43109s35cad87efc5161a7@mail.gmail.com","subject":"Re: Merge, rebase and whitespace fixes","fromName":"Rogan Dawes","fromEmail":"lists@dawes.za.net","sentAt":"2009-06-29T21:30:47Z","receivedAt":"2009-06-29T21:30:47Z","isPatch":false,"sender":{"key":"lists@dawes.za.net","avatar":null},"body":"Giuseppe Bilotta wrote:\n> Hello all,\n> \n> recently a tree I've been working on received some thorough whitespace\n> adjustments (changing indents from spaces to tabs). This results in\n> annoying conflicts when running merges or rebases with my local\n> branches. I tried googling around but I couldn't find any helpful\n> hints on how to make git cope with this. Any suggestions?\n> \n\nDo the same thing to your own tree?\n"},{"id":"117216","messageId":"cb7bb73a0906300037w6b61cae0jeecd2f97b1095b17@mail.gmail.com","threadId":"19967","inReplyTo":"4A493287.20106@dawes.za.net","subject":"Re: Merge, rebase and whitespace fixes","fromName":"Giuseppe Bilotta","fromEmail":"giuseppe.bilotta@gmail.com","sentAt":"2009-06-30T07:37:08Z","receivedAt":"2009-06-30T07:37:08Z","isPatch":false,"sender":{"key":"giuseppe.bilotta@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1464?v=4"},"body":"On Mon, Jun 29, 2009 at 11:30 PM, Rogan Dawes<lists@dawes.za.net> wrote:\n> Giuseppe Bilotta wrote:\n>> Hello all,\n>>\n>> recently a tree I've been working on received some thorough whitespace\n>> adjustments (changing indents from spaces to tabs). This results in\n>> annoying conflicts when running merges or rebases with my local\n>> branches. I tried googling around but I couldn't find any helpful\n>> hints on how to make git cope with this. Any suggestions?\n>>\n>\n> Do the same thing to your own tree?\n\nI tried doing the whitespace cleanup on top of the last patch, but the\nmerge still conflicted.\n\nThe interesting thing is that there's patchset from Robert Fitzsimons\nthat goes back to August 2005 (!) that does a couple of git apply\ncleanups and in particular adds the --ignore-whitespace option that I\nwould need ...\n\nhttp://permalink.gmane.org/gmane.comp.version-control.git/7876\n\nbut the patch apparently never made it into mainline ...\n\n-- \nGiuseppe \"Oblomov\" Bilotta\n"},{"id":"117221","messageId":"4A49D4C5.8090700@dawes.za.net","threadId":"19967","inReplyTo":"cb7bb73a0906300037w6b61cae0jeecd2f97b1095b17@mail.gmail.com","subject":"Re: Merge, rebase and whitespace fixes","fromName":"Rogan Dawes","fromEmail":"lists@dawes.za.net","sentAt":"2009-06-30T09:03:01Z","receivedAt":"2009-06-30T09:03:01Z","isPatch":false,"sender":{"key":"lists@dawes.za.net","avatar":null},"body":"Giuseppe Bilotta wrote:\n> On Mon, Jun 29, 2009 at 11:30 PM, Rogan Dawes<lists@dawes.za.net> wrote:\n>> Giuseppe Bilotta wrote:\n>>> Hello all,\n>>>\n>>> recently a tree I've been working on received some thorough whitespace\n>>> adjustments (changing indents from spaces to tabs). This results in\n>>> annoying conflicts when running merges or rebases with my local\n>>> branches. I tried googling around but I couldn't find any helpful\n>>> hints on how to make git cope with this. Any suggestions?\n>>>\n>> Do the same thing to your own tree?\n> \n> I tried doing the whitespace cleanup on top of the last patch, but the\n> merge still conflicted.\n> \n> The interesting thing is that there's patchset from Robert Fitzsimons\n> that goes back to August 2005 (!) that does a couple of git apply\n> cleanups and in particular adds the --ignore-whitespace option that I\n> would need ...\n> \n> http://permalink.gmane.org/gmane.comp.version-control.git/7876\n> \n> but the patch apparently never made it into mainline ...\n> \n\nOne thing I have done in the past when trying to merge two diverged\ntrees was to format each commit in each tree to a common standard.\n\nOne of the ways in which the trees had diverged was whitespace\n(non-meaningful) changes, so I used the Eclipse formatter as part of a\n\"git filter-branch\" script to make sure that I was ony looking at\nmeaningful changes between the trees at each point. This significantly\nsimplified the process.\n\nRogan\n"},{"id":"117222","messageId":"cb7bb73a0906300218k64e23bc1uf9e1ab72c2819e24@mail.gmail.com","threadId":"19967","inReplyTo":"4A49D4C5.8090700@dawes.za.net","subject":"Re: Merge, rebase and whitespace fixes","fromName":"Giuseppe Bilotta","fromEmail":"giuseppe.bilotta@gmail.com","sentAt":"2009-06-30T09:18:53Z","receivedAt":"2009-06-30T09:18:53Z","isPatch":false,"sender":{"key":"giuseppe.bilotta@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1464?v=4"},"body":"On Tue, Jun 30, 2009 at 11:03 AM, Rogan Dawes<lists@dawes.za.net> wrote:\n>> I tried doing the whitespace cleanup on top of the last patch, but the\n>> merge still conflicted.\n>>\n>> The interesting thing is that there's patchset from Robert Fitzsimons\n>> that goes back to August 2005 (!) that does a couple of git apply\n>> cleanups and in particular adds the --ignore-whitespace option that I\n>> would need ...\n>>\n>> http://permalink.gmane.org/gmane.comp.version-control.git/7876\n>>\n>> but the patch apparently never made it into mainline ...\n>>\n>\n> One thing I have done in the past when trying to merge two diverged\n> trees was to format each commit in each tree to a common standard.\n>\n> One of the ways in which the trees had diverged was whitespace\n> (non-meaningful) changes, so I used the Eclipse formatter as part of a\n> \"git filter-branch\" script to make sure that I was ony looking at\n> meaningful changes between the trees at each point. This significantly\n> simplified the process.\n\nI can also reply all the patches manually, of course, but the question\nis: why should I be doing something manually when it can be done\nprogrammatically?\n\nBTW, I tried updating Robert's patch to the new code base, but it's\nWAY too different ...\n\n-- \nGiuseppe \"Oblomov\" Bilotta\n"}]}