Skip to content

Instantly share code, notes, and snippets.

@luiszacheu

luiszacheu/SobreporBranchDerivadaDaMasterNaMaster

Created March 28, 2016 17:14
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save luiszacheu/b58feee1d0c8d1fb28be to your computer and use it in GitHub Desktop.
Save luiszacheu/b58feee1d0c8d1fb28be to your computer and use it in GitHub Desktop.
Download ZIP
Raw
SobreporBranchDerivadaDaMasterNaMaster
git checkout [branch_derivada_da_master]
git -s ours master
git checkout master
git merge [branch_derivada_da_master]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment