Maintaining my git repository.

Robert Helling helling at atdotde.de
Thu Jan 18 09:06:27 PST 2018


Hi,

> On 18. Jan 2018, at 17:27, Willem Ferguson <willemferguson at zoology.up.ac.za> 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20180118/69fae189/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 529 bytes
Desc: Message signed with OpenPGP
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20180118/69fae189/attachment.sig>


More information about the subsurface mailing list