I forgot one step in this process I want:

On Apr 30, 2016, at 5:56 PM, Steve Schow <st...@bstage.com> wrote:

> 
> 
> fossil checkout trunk
> (work on code)
> fossil commit —branch mybranch
> (work on more code)
> fossil commit
> (code review)
> fossil update trunk -n
> (resolve merge conflicts when they rarely occur ;-)
> fossil update trunk
   fossil merge mybranch
   (resolve conflicts if needed)
> (final feature test)
> fossil commit
> 

_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to