From: Stefan Sperling <stsp@stsp.name>
Subject: Re: got reintegrate
To: Mark Jamsek <mark@jamsek.com>
Cc: Evan Silberman <evan@jklol.net>, gameoftrees@openbsd.org
Date: Tue, 15 Oct 2019 11:16:09 +0200

On Tue, Oct 15, 2019 at 07:53:15PM +1100, Mark Jamsek wrote:
> I’m just catching up on this as I plan on using Got vice git but missed the
> first part of this discussion regarding ‘reintegrate’
> 
> Have I got it right that it basically syncs the master branch with the
> working branch? As in you checkout a new branch to, for example, add
> a new feature or fix a bug and then want to sync the master with the changes?

Yes, that's precisely it.

This is how the man page trys to explain it. Does this make sense to you?

     reintegrate branch
               Reintegrate the specified branch into the work tree's current
               branch.  Files in the work tree are updated to match the
               contents on the reintegrated branch, and the reference of the
               work tree's branch is changed to point at the head commit of
               the reintegrated branch.

               Both branches can be considered equivalent after reintegration
               since they will be pointing at the same commit.  Both branches
               remain available for future work, if desired.  In case the
               reintegrated branch is no longer needed it may be deleted with
               got branch -d.

> I apologise if I’m off the mark, I only caught the last couple messages
> but am trying to get an understanding.

No worries.