git rebase master

[Adam Williamson]

On Tue, 2013-05-28 at 11:30 +0200, Paolo Bonzini wrote:
> Il 27/05/2013 23:11, Adam Williamson ha scritto:
> > As soon as your
> > f19 build diverges from master at all, merging becomes inappropriate
> > (and probably impossible) and you should instead use 'cherry-pick'. It
> > helps to have at least a vague overview of how git is designed to be
> > used, and what is the actual _point_ of the commands you're using in the
> > intended git workflow.
> 
> Interestingly, git itself is developed the other way round: you first do
> the fixes in the oldest applicable branch and "git merge" upwards (from
> f18 to f19, from f19 to master in the Fedora case).

Indeed, AFAICT though, merging down from master is the most common
workflow in Fedora packaging git (and more in line with how the Fedora
dev process is 'supposed' to work).
-- 
Adam Williamson
Fedora QA Community Monkey
IRC: adamw | Twitter: AdamW_Fedora | identi.ca: adamwfedora
http://www.happyassassin.net