Bruno Haible <[EMAIL PROTECTED]> wrote: > Hi Jim, > > A git question: > > In http://lists.gnu.org/archive/html/bug-gnulib/2007-09/msg00130.html > you wrote: >> When one branch (your topic branch) is private, you *can* rebase, and thus >> avoid the merge. >> ... >> That's the whole point of rebasing. >> rebasing is essentially adjusting your deltas so that they apply >> with no fuzz, and no conflicts, to the latest version of the >> parent branch. > > It seems that when I do that, I have to do each conflict resolution twice. > Not sure I'm doing everything right.
Hi Bruno, I haven't read your account carefully yet, but here's a tip that should prove useful: I've learned not to modify ChangeLog on my private branches. Instead, I include the ChangeLog entry in the commit log. Only when I've pulled from my branch onto the trunk (and before pushing-to-public, of course) do I then copy the commit log to the ChangeLog file and add it to the change set via an "-amend" commit. This rigamarole makes me want to generate the ChangeLog from commit log entries. For coreutils, at least, they're nearly identical.
