🌐
Reddit
reddit.com › r/git › how do i overwrite one branch with another branch?
r/git on Reddit: How do I overwrite one branch with another branch?
May 20, 2019 - Thank you as well. It was only today that I realized what git reset does. This saved me quite a headache. ... You would have to force push that branch to the remote repository. If it is a branch, on which only you work on, that should be fine.
🌐
GitHub
gist.github.com › ummahusla › 8ccfdae6fbbe50171d77
Git overwrite branch with another branch · GitHub
git checkout -B master anotherbranch See https://stackoverflow.com/a/29871400/148680
Discussions

merge - How can I replace the 'master' branch in Git, entirely, from another branch? - Stack Overflow
Switch to master branch first, then run, git checkout seotweaks -- * then run, git commit -m "Replaced contents of master with seotweaks" finally run git push ... Save this answer. ... Show activity on this post. You should be able to use the “ours” merge strategy to overwrite master with ... More on stackoverflow.com
🌐 stackoverflow.com
git - How I can overwrite a branch with another one? - Stack Overflow
While I am developing I want to continue my work into another branch but base my work instead from master into another branch. For deployment management and workflow I use git flow. In my case I cr... More on stackoverflow.com
🌐 stackoverflow.com
merge - How to replace master branch in Git, entirely, from another branch? - Stack Overflow
Switch to master branch first, then run, git checkout seotweaks -- * then run, git commit -m "Replaced contents of master with seotweaks" finally run git push ... Save this answer. ... Show activity on this post. You should be able to use the “ours” merge strategy to overwrite master with ... More on stackoverflow.com
🌐 stackoverflow.com
How to overwrite remote with another remote branch?
The command you're probably looking for is git branch --set-upstream-to= More on reddit.com
🌐 r/git
3
7
November 14, 2018
People also ask

How do I overwrite a single directory from another branch without merging the whole branch?

Use git checkout -- . For example, git checkout dev -- scripts/ copies only the scripts/ directory from dev into your current branch, without merging any other files. Commit the result to record the change.

🌐
daehnhardt.com
daehnhardt.com › home › git survival guide › git checkout for overwriting directories from different branches
Git Checkout for overwriting directories from different branches
What is the difference between git checkout and git restore for restoring files?

git checkout moves HEAD, switches branches, and can overwrite paths from another branch. git restore is the newer, narrower command dedicated to restoring file contents from the index or a commit, giving more granular control without touching HEAD.

🌐
daehnhardt.com
daehnhardt.com › home › git survival guide › git checkout for overwriting directories from different branches
Git Checkout for overwriting directories from different branches
Does git checkout overwrite uncommitted changes in the working directory?

Yes. git checkout -- replaces the files at that path with the source-branch versions, discarding any uncommitted local edits there. Commit or stash your work first if you need to keep it.

🌐
daehnhardt.com
daehnhardt.com › home › git survival guide › git checkout for overwriting directories from different branches
Git Checkout for overwriting directories from different branches
Top answer
1 of 15
335

You can use the 'ours' merge strategy:

$ git checkout staging
$ git merge -s ours email # Merge branches, but use our (=staging) branch head
$ git checkout email
$ git merge staging

The question requires the commits of the email branch to be kept. They must not be made unreachable, which rules out any reset-based approaches or deleting and recreating the branch.

I no longer need the old changes in email branch, yet I don't want to delete them.

To keep commits of both branches reachable, one or more references must exist that point to those commits. You can always keep two references (staging and email), but the question asks to get rid of one of the refs. Therefore, the branches need to be merged somehow.


EDIT 2020-07-30:

I thought a bit more about this question and possible solutions. If you absolutely require the merge parents in the correct order, need to perform this action with a single command line invocation, and don't mind running plumbing commands, you can do the following:

$ git checkout A
$ git merge --ff-only $(git commit-tree -m "Throw away branch 'A'" -p A -p B B^{tree})

This basically acts like the (non-existent) merge -s theirs strategy. You can find the resulting history in the plumbing branch of the demo repository

Not very readable and not as easy to remember compared to the -s ours switch, but it does the job. The resulting tree is again the same as branch B:

$ git rev-parse A^{tree} B^{tree} HEAD^{tree}
3859ea064e85b2291d189e798bfa1bff87f51f3e
0389f8f2a3e560b639d82597a7bc5489a4c96d44
0389f8f2a3e560b639d82597a7bc5489a4c96d44

EDIT 2020-07-29:

There seems to be a lot of confusion as to what the difference between -s ours and -X ours (the latter being equivalent to -s recursive --strategy-option ours) is. Here's a small example to show the two results from using these two methods. I also recommend reading the question and answers of (Git Merging) When to use 'ours' strategy, 'ours' option and 'theirs' option?

First, setup a repository with 2 branches and 3 commits (1 base commit, and 1 commit per branch). You can find the sample repository on GitHub

$ git init
$ echo 'original' | tee file1 file2 file3
$ git commit -m 'initial commit'
$ git branch A
$ git branch B
$ git checkout A
$ echo 'A' > file1
$ git commit -m 'change on branch A' file1
$ git checkout B
$ echo 'B' > file2
$ git commit -m 'change on branch B' file2

Now, let's try the strategy option (doesn't really matter if we use theirs or ours for this explanation):

$ git merge -X ours A
$ cat file*
A
B
original

We end up with a merge of both branches' contents (branch "strategy-option" in the sample repo). Compare that to using the merge strategy (re-init your repository or reset branch, before executing the next steps):

$ git merge -s ours A
$ cat file*
original
B
original

The result is quite different (branch "merge-strategy" in the sample repo). With the strategy option, we get a merge result of both branches, with the strategy we throw away any changes which happened in the other branch.

You will also notice that the commit created by the merge-strategy in fact points to the exact same tree as the latest commit of "our" branch, while the strategy-option created a new, previously-unseen tree:

$ git rev-parse A^{tree} B^{tree} merge-strategy^{tree} strategy-option^{tree}
3859ea064e85b2291d189e798bfa1bff87f51f3e
0389f8f2a3e560b639d82597a7bc5489a4c96d44
0389f8f2a3e560b639d82597a7bc5489a4c96d44
5b09d34a37a183723b409d25268c8cb4d073206e

OP indeed asked for "I no longer need the old changes in […] branch" and "So I just want to dump all the contents of [A] into [B]", which is not possible to do with a strategy option. Using the 'ours' merge strategy is one possibility of many, but likely the easiest (other possibilities include using low level commands of Git such as write-tree and commit-tree).

2 of 15
143

I've seen several answers and that's the only procedure that let me fix that without any conflicts.

If you want all changes from branch_new in branch_old, then:

git checkout branch_new
git merge -s ours branch_old
git checkout branch_old
git merge branch_new

once applied those four commands you can push the branch_old without any problem

🌐
GeeksforGeeks
geeksforgeeks.org › git › how-to-replace-master-branch-with-another-branch-in-git
How to Replace Master Branch with Another Branch in GIT? - GeeksforGeeks
June 4, 2024 - Be very careful with this step as it will overwrite the remote master branch. ... To ensure everything went smoothly, you should verify that the remote master branch has been updated. ... Review the commit history to confirm that it matches the branch you replaced it with. Replacing the master branch with another branch in Git involves careful steps to ensure that the new branch content accurately reflects in the master branch.
🌐
w3tutorials
w3tutorials.net › blog › how-do-i-overwrite-rather-than-merge-a-branch-on-another-branch-in-git
How to Overwrite a Git Branch with Another Branch (Instead of Merging) – Make Them Point to the Same Commit
Undoing a failed experiment: If a branch veered off track, overwriting it with the main branch resets your work to a known good state. ... A local Git repository (clone it with git clone <repo-url> if needed).
🌐
Daehnhardt
daehnhardt.com › home › git survival guide › git checkout for overwriting directories from different branches
Git Checkout for overwriting directories from different branches
September 22, 2024 - How to get your branch ... To overwrite one branch’s directory with the contents of the same directory from another branch, run git checkout <source-branch> -- <path>/ and commit the result.
Find elsewhere
🌐
Graphite
graphite.com › guides › git-overwrite-local-remote
How to overwrite a local git local branch with a remote - Graphite
If not, first check out the desired branch with: ... The git reset command is the most direct way to overwrite your local branch. Use the --hard option to reset the index and working tree.
Top answer
1 of 2
99

If you want all changes from master in dev_branch, then:

git switch dev_branch
git reset --hard master

If you have dev_branch pushed to a remote already, you have to do:

git push --force

To force-push the branch to the remote. Warning: This will break the history of the branch for people who cloned it before! Then, other people will have to do a git pull --rebase on the dev_branch to get the changes.


You can also rename the dev branch to something old and then make a new branch from master with the same name:

git branch -m dev_branch old_dev_branch
git branch -m master dev_branch

Or, use the ours strategy — not sure why it wouldn't work for you:

git checkout master
git merge -s ours dev_branch
git checkout dev_branch
git merge master
2 of 2
1

Why do that? You can delete the branch if it isn't needed anymore (But why? Branches cost next to nothing.). Or you can rename it:

git branch -m dev_branch obsolete_dev

Or you could do this to delete it:

git branch -D dev_branch

Now create a new branch off master (assuming you are on it):

git branch dev_branch

See git branch --help for further options (setting up remotes and all that jazz).

If you now have new branches, you'll have to synchronize with any peer repositories.

Best way to avoid hassle: Have an "active" development branch, if it goes stale, abandon it and create a new one. No history lost that way (could prove crucial sometime).

Have e.g. a branch for each major version, develop on branches off those to fix version bugs, master forges ahead. Use cherry-pick and perhaps merges to port fixes to older versions.

🌐
Better Stack
betterstack.com › community › questions › replace-master-branch-in-git
How to Replace Master Branch in Git, Entirely, from Another Branch? | Better Stack Community
June 24, 2024 - # Checkout the branch you want ... repository git push --force origin master · Replace <branch-to-replace-master> with the name of the branch you want to replace master with....
🌐
Git Scripts
gitscripts.com › git-overwrite-branch-with-another-branch
Git Overwrite Branch with Another Branch: A Quick Guide
January 21, 2025 - In Git, overwriting a branch involves replacing the current state of one branch with the state of another.
🌐
Knasmueller
knasmueller.net › home › git: overwriting ‘master’ with another branch
Git: Overwriting 'master' with Another Branch - Bernhard Knasmüller on Software Development
October 8, 2019 - Using the -f flag, your previous master is completely overwritten with develop, including its history. Warning: this erases all commits from the master branch that are not also in the develop branch. This solution may be appropriate in your case if you have a small number of other branches ...
🌐
GitHub
gist.github.com › 38befcde0ce38f82217c44d16971acbb
Overwrite master with another branch · GitHub - Gist
Save beall49/38befcde0ce38f82217c44d16971acbb to your computer and use it in GitHub Desktop. Download ZIP · Overwrite master with another branch · Raw · overwrite_master_branch.sh · This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below.
🌐
Bounga's Home
bounga.org › tips › 2016 › 12 › 09 › replace-branch-with-another-one-in-git-repository
Replace a branch with another one in a Git repository - Bounga’s Home
December 8, 2016 - Git is so powerful that there must be a clean way to do this. And yes there’s one. Go to the branch you want to become the new “master”, then merge “master” by telling you don’t care about unrelated histories and what you want to keep is the work in the current branch:
🌐
Squash
squash.io › how-to-force-overwrite-during-git-merge
How to Force Overwrite During Git Merge - Squash Labs
October 28, 2023 - The --strategy-option=theirs tells git to take the changes from other_branch and overwrite any conflicting changes in the current branch. It's important to note that this method uses the "theirs" merge strategy, which means that it will always ...
🌐
Nick Ang
nickang.com › 2017-09-30-replace-git-branch-code
How to completely replace git branch code with another branch's code | Nick Ang
September 30, 2017 - The post explains how a team discovered that their staging and master branches had different commit counts because GitHub merge commits added extra history to master, even though the code was effectively in sync. It then describes replacing one branch's code and history with another by force-pushing the source branch into the target branch, using commands like fetch, reset, renaming branches, and pushing to update remote history.
🌐
GitHub
gist.github.com › beall49 › 38befcde0ce38f82217c44d16971acbb
Overwrite master with another branch · GitHub
Save beall49/38befcde0ce38f82217c44d16971acbb to your computer and use it in GitHub Desktop. Download ZIP · Overwrite master with another branch · Raw · overwrite_master_branch.sh · This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below.