Re: Weird merge records

From

DSDan Stromberg <strombrg@gmail.com>

Date

May 8, 2023, 16:53 UTC

Message-ID

<CAOvKW57WdwNoYXJyebMf-V4mQBz5CjvD=qhGxtht_2YKuygL1g@mail.gmail.com>

In-Reply-To

<64590f5430b36_79d229439@chronos.notmuch>

> > You seem to be implying that I shouldn't use 'git pull --rebase
> > upstream "$branch"'.
>
> If you know what you are doing, then do whatever you want. `git pull --rebase
> upstream $branch` is fine, if you know what that does.

I consider myself a git neophyte.  It's a large topic.

> I would just keep in mind that `git pull` wasn't meant to merge your changes to
> upstream, it was meant to merge $branch to your integration branch.

I see.

> > If that's the case, what would you recommend?
>
> I would recommend `git fetch` + `git rebase` (or merge). If you are explicit
> about what you want to do, surprises are minimized.

Might that look like:
        git checkout "$branch"
        git fetch upstream
        git rebase "$branch"
        git push origin "$branch"
?

Thanks!