It’s easy, believe me.
You need both branches in your local repo, but first you need two branches.
I copied the master over master-tx to accept there Transifex pushes:
git push origin master:refs/heads/master-tx
I’m not sure if that was OK, but it worked for me, mainly because I needed the remote branch, but at that moment I had no idea about merging.
Then you create a local copy of your new remote branch:
git branch master-tx origin/master-tx
Select the new branch:
git checkout master-tx
Get the remote changes:
git pull origin master-tx
Go back to your master branch:
git checkout master
Merge the changes from the new branch:
git merge master-tx
And push the changes!
git push
Easy! It’s so easy that I think it’s a good idea to write it all here. heh.
-
howardtharp liked this
-
usebox posted this
