On 05/06/11 05:15, Simon Peyton-Jones wrote:
So I think merging the master onto the branch must be done regularly not as a 
big bang at the end.

If someone would like to write a duffers guide describing how to do that, I'm 
happy to follow it.  But the only way I understand is to merge master onto the 
branch regularly, and finally merge the branch onto the master.  I don't see 
the disadvantage of this approach.  Yet.

I suppose one could (frequently) make a new throwaway branch that merges the current branch work and HEAD in order to validate it.

I remember hearing that git-rerere is supposed to facilitate that. Like when conflicts between branch and HEAD need to be resolved in a certain way, it can remember that for you..(haven't used it myself).

That sounds slightly like madness to me..Nevertheless is it a suggested workflow? (Does it work well?) Is Googling the way to find answers?

-Isaac

_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to