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 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. Thanks, Matt -- Matt Domsch Technology Strategist Dell | Office of the CTO -- devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/devel
