Where can I find the new git repository?
steve at sohara.org
Sat Dec 26 18:32:04 UTC 2020
On Sat, 26 Dec 2020 10:52:10 -0600
Tim Daneliuk <tundra at tundraware.com> wrote:
> On 12/26/20 5:32 AM, Steve O'Hara-Smith wrote:
> > To collect changes from upstream use git fetch to fetch them
> > and integrate them into your local branch use git pull (which combines a
> > fetch and merge into your local repository).
> As a general matter, I do this:
> git pull --rebase
> That way any local changes I have committed will get laid down on top
> of the remote master code.
Yep that's the best way if you have local changes to remote
branches, I prefer to use separate branches for local changes using the
local copy of the remote branch as the upstream of the working branches.
Steve O'Hara-Smith <steve at sohara.org>
More information about the freebsd-questions