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). Paolo -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
