On Thu, 2010-01-14 at 13:52 +0100, Jiří Techet wrote: > can I use your local rendering branch as a base for > my merge (i.e. aren't you going to do some new merge/rebase that would > then complicate merge of my branch)? > If you put the additional fixes > that make it working on top of it it should be no problem to merge > them back to my work. Also should I rebase my branch on top of it or > use ordinary merge? Yes use it, but if you do please don't remove the branch, just rebase yours on top. git is pretty intelligent and allows rebranching. :) (see the git rebase --onto examples in the man pages) Pierre-Luc
Attachment:
signature.asc
Description: This is a digitally signed message part