This is the mail archive of the
mailing list for the Archer project.
Re: New branch for Fedora 11 merges
El miÃ, 25-02-2009 a las 23:41 +0100, Jan Kratochvil escribiÃ:
> 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
> so far.
> 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.
When I post python patches upstream and rework them based on review
comments, I always make the changes both in the python branch and in the
patch I'm submitting, to avoid exactly that problem. In fact, most of
the time, I do the rework in the branch and then cherry-pick the commit
to the branch with the python patches.
If there's a merge conflict because upstream is different than the
python branch, then I probably screwed up somewhere. But I try to be
careful with this.
Thiago Jung Bauermann
IBM Linux Technology Center