CODEWITHSUNDEEP
git
Arpit Aggarwal
Arpit Aggarwal

Reputation: 29316

Git Overwrite master with branch

I want to overrite master with a particular branch after making changes to it, what I done to do it is:

Step 1: Checkout brranch from Git, using command :

git checkout branch_name

Step 2: I done some changes in code, now I want to make this branch as master, for that I first run the command:

git status

Above command list me all the modified files.

Now my question, what all I need to do overrite master with this particular branch "my_branch"?

Upvotes: 45

Views: 78938

Answers (2)

aragaer
aragaer

Reputation: 17858

git branch -f master dev_branch will rewrite local master branch.

git push remote +dev_branch:master will rewrite remote branch.

  • NOTE: If the above doesn't work, the name remote could be origin for you (i.e. git push origin +dev_branch:master)

Upvotes: 111

ice_chrysler
ice_chrysler

Reputation: 2813

To completely replace the master branch with the contents of any other feature_branch you can also use:

git checkout feature_branch
git merge -s ours --no-commit master
git commit      # Add a message regarding the replacement that you just did
git checkout master
git merge feature_branch

See: http://git.tutorialhorizon.com/2014/10/05/replace-the-master-branch-with-another-branch-in-git/

Upvotes: 51

Related Questions