This is the mail archive of the
mailing list for the Archer project.
Re: New branch for Fedora 11 merges
On Wed, 25 Feb 2009 23:32:38 +0100, Tom Tromey wrote:
> Pardon my git ignorance here, but why doesn't "git merge master", plus
> fixing up the conflicts, also have the desired effect?
In general I agree; just I was using git-revert in archer-jankratochvil-misc
If I change func1() and func2() in GIT, post it for FSF GDB, func1() change is
dropped during the discussion as needless, func2() gets accepted.
"git merge master" will excessively keep func1() modified in the GIT branch.
I understand it may happen only very rarely.
> The issue with revert is that, at least on that branch, the commits
> don't always correspond to upstream patches, because we're submitting
> things in a different order than we write them.
I agree the submitted part may be only a part of some GIT commit. Just if it
is possible I find it more clean - if I apply a new patch I should remove
first the old patch as otherwise I will definitely have to resolve a conflict.