Git commit in all available branches
Pavel Alexeev (aka Pahan-Hubbitus)
forum at hubbitus.com.ru
Tue Oct 12 16:22:59 UTC 2010
Unfortunately it is not what I initially ask :(
12.10.2010 19:14, Matt_Domsch at dell.com wrote:
> Correct, it's simply a git merge specifying the merge method, to ensure there are no merge conflicts - just make an exact copy of the origin/master branch onto the current branch. You must still 'fedpkg switch-branch' before invoking this.
> Matt Domsch
> Technology Strategist
> Dell | Office of the CTO
> -----Original Message-----
> From: Pavel Alexeev (aka Pahan-Hubbitus) [mailto:forum at hubbitus.com.ru]
> Sent: Tuesday, October 12, 2010 3:07 AM
> To: Domsch, Matt
> Subject: Re: Git commit in all available branches
> 11.10.2010 05:28, Matt Domsch пишет:
>> On Fri, Oct 08, 2010 at 06:03:04PM +0400, Pavel Alexeev (aka Pahan-Hubbitus) wrote:
>>> In most cases I try sync all branches if there no real reasons to
>>> make differences.
>>> After made some changes in origin/master and commit is I also must do
>>> for each available branches something similar:
>>> fedpkg switch-branch el5;
>>> git pull
>>> git merge origin/master
>>> git push
>>> fedpkg build
>>> fedpkg update
>> I find this works to apply the version from 'master' into the current
>> (say, el5) branch.
>> $ git merge -s recursive -X theirs master
> Sorry, I think does not understand you. Where I can there provide on what branches I want do that?? On first glance it us mostly equivalent of present before "git merge origin/master" with additional strategy option only. I've read git-merge man, but still does not understand how it helps. Please describe slightly.
>> There are valid reasons for doing this - e.g. a bug fix release of a
>> package by the upstream, that doesn't break the ABI.
More information about the devel