* Peter Rosin wrote on Fri, Jan 23, 2009 at 12:01:00AM CET: > Den 2009-01-22 21:54 skrev Ralf Wildenhues: >> >> 1) create, in your own repository, a new branch pr-tests-newline-fixes >> containing this one patch, then merge this patch into both >> pr-msvc-support and into master, then push the last two (no need to ever >> push pr-tests-newline-fixes),
> I commited the attached using method 1. However I felt I had to base > the new branch on the common ancestor of master and pr-msvc-support > in order to get a clean(er) merge into both branches. OK. That way you did not merge the rest of master's current changes into pr-msvc-support. I would not have minded if you had done that, either, but it doesn't matter. > Also, I should > perhaps have used a different merge message? I thought it looked ok > in my local repo, but that was only because the temporary branch exists > there, right? The message was just fine. gitk --all looks good here. Thanks, Ralf
