How to achieve a private branch in git that “floats” when merging with upstream?
问题 I have a fork of another organization's repository. I'm at the the latest tag in the repo, which is not the head, and I've created a branch from that tag which will never be pushed upstream. That's why I consider the branch private. I've made commits to my private branch and am using that code in my production environment. When a new tag is made to the upstream repository, I want to be able to pull their changes. However, I'd like to always keep my commits in a neat stack on top of their last