[sup-devel] What's your workflow?
wmorgan-sup at masanjin.net
Tue Dec 29 15:43:15 EST 2009
Reformatted excerpts from Tero Tilus's message of 2009-12-29:
> Wiki page just doesn't say anything on how to have your own daily-sup
> branch (master or next + a set of own and others' patches) and how to
> keep that up-to-date with upstream while your develop your own patches
> (which are supposed to live in topic branches).
You should be able to make a daily-sup branch off of (say) next, apply
all your patches, and whenever next changes and you want to update,
rebase like so:
$ git checkout next
$ git pull
$ git checkout daily-sup
$ git rebase next
If you have feature branches merged into daily-sup, I think you need to
use `git rebase -p next` to get it to recreate those merges. But I've
never gotten that complex.
(You could also just merge in next each time, which might be easier.
Rebase has the advantage of keeping your patch set up to date with the
remote branch, though, which might be nice if you decide to publish
William <wmorgan-sup at masanjin.net>
More information about the Sup-devel