I'm not sure the best way to handle this, but I think what I want to do is push one set of changes to multiple branches, or duplicate the most recent changes in multiple branches.
I have one project, that has three separate targets, that (currently) only differ in "branding" (icons, splash screens, messages, etc.) and version number. I just made a large set of changes that only affected shared code, so I checked the changes into origin/master. I'd like the same "snapshot" of code to be in each of the brand-specific branches.
I'd like to do this using SourceTree (Mac), but I can use the Bitbucket web interface, or raw git commands, if necessary.
I'm not entirely sure if this will work with your branching strategy, but the ideal solution would be to merge master into each other branch.
If there are other changes to master that you don't want to propagate to the other branches, you can check out each other branch and "cherry-pick" the commit in question (in SourceTree, right-click the commit you want to cherry-pick). http://git-scm.com/docs/git-cherry-pick
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs