Skip to content

Instantly share code, notes, and snippets.

@michaelkeevildown

michaelkeevildown/git-overwrite.sh

Created June 13, 2016 17:43
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save michaelkeevildown/164497d2fdf366a6d95ac4a79ce94cfc to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save michaelkeevildown/164497d2fdf366a6d95ac4a79ce94cfc to your computer and use it in GitHub Desktop.
Download ZIP
Git Overwrite
Raw
git-overwrite.sh
# branch_name = New branch not MASTER e.g. new_dev
git checkout {branch_name}
git merge -s ours master
git checkout master
git merge {branch_name}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment