Hi, > On 18. Jan 2018, at 17:27, Willem Ferguson <[email protected]> > wrote: > > What is the most sane way of keeping DEV1 and DEV2 in sync with master?
after you pulled the upstream changes into your local master branch, you should rebase (see https://git-scm.com/docs/git-rebase <https://git-scm.com/docs/git-rebase>) your DEV? branches on that updated master. If there are conflicts you can (and should) resolve those on the way). Best Robert
signature.asc
Description: Message signed with OpenPGP
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
