What should I do when a pull request is selected from cherry?

Question

I forked the project on GitHub, pushed some changes, and opened a port request. The maintainer signed and applied the changes to the new commit (and not about merging my commit), so the commit graph looked like this:

* 03a0687 (origin/master) frotz: Corrected MAN_PREFIX | * 11d3e98 (HEAD, master, jleedev/master) frotz: Corrected MAN_PREFIX |/ * 9c3dd1a yajl: use direct patch from Github. 

Obviously, I need to either reinstall or force update the local branch. Should I then click on my fork on GitHub? I basically ask because updating strength does not have to be automatic. Is this the standard thing to do when your changes are selected by the cherry character?

Answer 1

The simplest thing is to always work on topic branches. That way, your master forks branch always looks upstream, so if upstream includes your changes, you always do the same, just delete your tag branch.

If the upstream merges your changes, your master and topic branch also contains the same commits, and you can safely remove the topic branch. If the cherry selects your commits upstream, then after checking the changes made to it, you can simply delete the topic branch.

Another important advantage of this is that you can easily reinstall the theme branch against the wizard. Sometimes, if a patch cannot be applied upstream without manually resolving conflicts, it will ask you to reinstall or merge and resolve the conflict yourself, as its code and you know more about it. I also suspect that they chose cherries because they grabbed after you made the fork and did not want to merge for just a few commits. Thanks to a set of cherries, they kept their history more linear and clean. If you reinstalled often, it might have been just an accelerated merge for them, and they didn't have to choose worms.

As for your question about what to do right now, forcibly updating the local branch and then forcibly pushing back to your fork is the only real option that you have.