On 23 Sep 2015, at 00:03, Junio C Hamano <gits...@pobox.com> wrote: > larsxschnei...@gmail.com writes: > >> From: Lars Schneider <larsxschnei...@gmail.com> >> >> diff to v6: >> * fix spaces in .gitattributes for Git-LFS files (old "[:space:]", new >> "[[:space:]]") >> * generated patch on top of next (95c4325) to resolve merge conflicts >> >> I am sorry about the "[:space:]" bug this late. I had the fix in my >> development >> branch but missed to apply it in this patch series. >> >> @Junio: >> Your conflict resolution in pu looks good. Nevertheless, I made this patch on >> top of next to ease the integration. I hope this is ok. > > Please don't rebase without a good reason, especially after you > checked the conflict resolution is OK and your reroll does not > affect the way the conflicts are resolved. If you based your > v6 patch on v2.6.0-rc0 and then your v7 patch needs to use something > that did not exist v2.6.0-rc3, you cannot avoid rebasing on top of > that newer codebase to use that new feature, but otherwise, no. > > This is because I prefer to apply the new series to the same base > version so that each step can be compared with the corresponding > step in the previous round. > > I even try hard to keep the commits from the older round if the > patch text and log message are unchanged. This time, I had to > backport [v7 6/7] to apply to the same base before noticing and > verifying that [v7 7/7] is the only thing that was changed in this > round. All the other ones turned out to be identical. > > Hence, the end result for me was > > $ git checkout ls/p4-lfs > $ git reset --hard HEAD^ > $ git am -s git-p4-lfs-7-of-7.mbox > > but it took me a lot longer than necessary because of the rebase. > Understood. Thanks for taking the time and explaining me your workflow. That helps a lot as my intention was to save your time, not waste it.
Sorry, Lars -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
