Skip to content

Instantly share code, notes, and snippets.

@meirabruno

meirabruno/Sobrepõe better_branch na master

Created August 20, 2015 14:11
Show Gist options
  • Save meirabruno/b2c4203b293a1c55f153 to your computer and use it in GitHub Desktop.
Save meirabruno/b2c4203b293a1c55f153 to your computer and use it in GitHub Desktop.
Download ZIP
Passos para sobrepor branch derivada da master na master
Raw
Sobrepõe better_branch na master
link: http://stackoverflow.com/questions/2763006/change-the-current-branch-to-master-in-git
git checkout better_branch
git merge --strategy=ours master # keep the content of this branch, but record a merge
git checkout master
git merge better_branch # fast-forward master up to the merge
@ramonrdm
Copy link

ramonrdm commented May 7, 2019

otimo! funcionou perfeitamente! obrigado!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment