On Thu, May 14, 2009 at 12:25 PM, Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> wrote: > On Thu, 2009-05-14 at 10:37 -0400, Jon Smirl wrote: > >> You and I can easily see how this patch can be folded into the next >> one. Git is broken in this situation. I've reported the issue to the >> git people and they acknowledge it, but no one has fixed it. Git's >> merge strategy does not handle the case of a file splitting. When git >> tries to merge this one-liner into the next patch that splits the >> files, it does the merge wrong which then messes up the entire patch >> stack. > > It should be possible to do the relevant thing by hand - it's only a one > line change you're staging out. Like I say, not the end of the world > anyway. I manually edited the diff files to fix this. That not something I like to do because it is too easy to make mistakes. Once they were edited I could feed them back into git. This is the second time I've hit this problem in git. -- Jon Smirl jonsmirl@xxxxxxxxx _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
