I'm trying to learn branches in git, and one bit of advice I've heard,
from the one video that's been most helpful to me, is that "merging
locally isn't normally done; instead, changes are pushed and a pull
request is made."  So I did that, and now my GitHub repo is up-to-date.
GitHub also assured me that I could delete the branch, so I did that.

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 have both branches backed up locally, because frankly I don't know
what I'm doing, and I've corrupted repos before and had to git init or
git clone from scratch.  It's a hassle maintaining both git and manual
systems in parallel, but at least I know I won't lose everything on my
next git stumble.

I've been using git for 4 years now, in part on the promise that it will
make my life easier.  How can that happen when, after 4 years, this
software is still utter black magic to me?

[*]"master" using the old terminology.

Post a reply to this message