Cousin Ricky <ric### [at] yahoocom> wrote:
> On 2026-01-01 12:00 (-4), Cousin Ricky wrote:
> >
> > But now, I've still got 2 local branches, and my local main does not
> > have the changes from the branch.  How do I update the local main if I'm
> > not supposed to merge locally?
>
> I think I figured it out.  You're suppose to do a pull from GitHub after
> you've done the pull request from the branch, right?
>
> git checkout main
> git pull origin main

Yes, once the remote branch is merged into main, you pull main so you have the
changes locally. You can then branch from that going forwards. You can
(optionally) delete the local branch too at that point - any further changes are
best done via a new branch and PR.

I use git for work daily; I'm no wizard but I have a somewhat intuitive feel for
my usual workflow now. I rarely get tangled up any more, and there's endless
examples and tutorials to be googled for help if I do. I remember when I first
started using it, there really was the feeling that I was just reciting
incantations with no obvious connection to reality :)

Bill

Post a reply to this message