I just successfully merged a pull request branch to our master branch, but our release branch, which was branched from master a couple of weeks ago (bad sign already) also needs those changes. The changes were small, so I could easily do all this manually, but what are some reasonable techniques that I can use to do this a little "cleaner"?
I believe I need to have a separate pull request branch (we're using bitbucket/stash, if that matters) for the release branch than I had for the master branch. Is it reasonable to generate a "diff" file from the original PR branch and then apply that when I create the PR branch off of the release branch? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.