ChatGPT解决这个技术问题 Extra ChatGPT

How to replace local branch with remote branch entirely in Git?

git

I have two branches:

local branch (the one which I work with) remote branch (public, only well-tested commits go there)

Recently I seriously messed up my local branch.

How would I replace the local branch entirely with the remote one, so I can continue my work from where the remote branch is now?

I have already searched SO and checking out to the remote branch locally does not have any effect.

I know the accepted answer has 1280 up-votes, but you should really consider changing the accepted answer to the one by @TTT.

M
Mathieu K.

Make sure you've checked out the branch you're replacing (from Zoltán's comment). Assuming that master is the local branch you're replacing, and that "origin/master" is the remote branch you want to reset to: git reset --hard origin/master

This updates your local HEAD branch to be the same revision as origin/master, and --hard will sync this change into the index and workspace as well.


Thanks for your suggestion, I am just so 'scared' of using --hard and --force already, so I just picked the solution which does not use those.
@KonstantinLevin: ah yes, the naming of those options is rather irritating. git reset by default will repoint your current branch and sync the index. --soft will skip updating the index, --hard will also sync the workspace. My own experience is using --hard most of the time, except when I want to undo the last commit (which is just git reset HEAD^)
After having more experience with git I'm convinced this is a better solution, thanks.
probably you will need to fetch first: git fetch origin remote_branch
You should note that this will replace whichever branch your currently on with the contents of master. So if you're on e.g. a feature-branch, it will replace all its commits with master, so make sure you've checked out the branch you're replacing first.
s
scharfmn

That's as easy as three steps:

Delete your local branch: git branch -d local_branch Fetch the latest remote branch: git fetch origin remote_branch Rebuild the local branch based on the remote one: git checkout -b local_branch origin/remote_branch


Actually what @araqnid said is right and more concise. I've tested it and you may try it too.
Wow, the git checkout -b local_branch origin/remote_branch is great! I always did this in two seperate commands. thanks!
You might need to do git branch -D local_branch in the first step if your branch is not merged.
thanks, I had a hard time when using gitflow, after publishing a branch and then finishing it, i wanted to go to the deleted branch, and your solution was the only one that worked, pull does not seem to work.. or I mave have not use it well --
we should ensure that the current branch is not the one which is to be to deleted.
T
TTT

I'm kind of surprised no one mentioned this yet; I use it nearly every day:

git reset --hard @{u}

Basically, @{u} is just shorthand for the upstream branch that your current branch is tracking. For example, this typically equates to origin/[my-current-branch-name]. It's nice because it's branch agnostic.

Make sure to git fetch first to get the latest copy of the remote branch.


I've had a few instances where I added answers to old questions, and my answers worked their way up the leaderboard. I hope this one does.
This looks like the most modern approach, the previous approach of git reset --hard origin/master is rejected on my 2.29.2 git executables which print out # fatal: Cannot do hard reset with paths.
Surprised no one has mentioned that using it every day seems like an anti-pattern - what local changes are you clobbering constantly? This should be an rare occurrence or your usage of VCS needs to be reworked.
@KevinLee LOL. That's harsh! When I wrote that I was on the DevOps team and did a lot of throwaway testing of builds and merges, daily. As a developer I still do that sometimes but admittedly it's no longer "every day". Nowadays it's usually when I catch minor things while doing code reviews, and I fix them up and amend or rebase other dev's branches for them. When I'm done I instruct them to do this command on their own local branch so they can grab my changes before addressing the other suggestions in their PR. That's probably weekly, at least. ;)
@KevinLee I just thought you'd be happy to know in the last couple of weeks I'm still finding myself doing this almost every day. I tend to do a lot of throwaway commits regularly, for various reasons (answering SO questions or learning new Git commands, teaching my co-workers about Git and demoing commands to them, and while coding, testing merges), and it's slightly faster for me to to type @{u} than it is to figure out how many commits I need to reset back with @~X.
S
Sailesh
git branch -D <branch-name>
git fetch <remote> <branch-name>
git checkout -b <branch-name> --track <remote>/<branch-name>

What does the --track part do?
@GitSync, This is what git help branch says about --track. When creating a new branch, set up branch.<name>.remote and branch.<name>.merge configuration entries to mark the start-point branch as "upstream" from the new branch. This configuration will tell git to show the relationship between the two branches in git status and git branch -v. Furthermore, it directs git pull without arguments to pull from the upstream when the new branch is checked out. I fixed this command in the answer. Thanks for raising the point.
You can say that it is just for convenience. If you do git status, it will report if your local branch is ahead or behind remote branch if you have them associated. Additionally, you can do git pull (or push) instead of full git pull <remote> <branch> if you have already set your branch to track <remote/branch>.
M
Modular

Replace everything with the remote branch; but, only from the same commit your local branch is on:

git reset --hard origin/some-branch

OR, get the latest from the remote branch and replace everything:

git fetch origin some-branch
git reset --hard FETCH_HEAD

As an aside, if needed, you can wipe out untracked files & directories that you haven't committed yet:

git clean -fd

The git clean command did it for me. git reset hard origin/master do not wipe out untracked files. Thanks!
J
Joshua S

The safest and most complete way to replace the current local branch with the remote:

git stash
git merge --abort
git rebase --abort
git branch -M yourBranch replaced_yourBranch
git fetch origin yourBranch:yourBranch
git checkout yourBranch

The stash line saves the changes that you have not committed. The branch line moves your branch to a different name, freeing up the original name. The fetch line retrieves the latest copy of the remote. The checkout line recreates the original branch as a tracking branch.

Or as a bash function:

replaceWithRemote() {
    yourBranch=${1:-`git rev-parse --abbrev-ref HEAD`}
    git stash
    git merge --abort
    git rebase --abort
    git branch -M ${yourBranch} replaced_${yourBranch}_`git rev-parse --short HEAD`
    git fetch origin ${yourBranch}:${yourBranch}
    git checkout ${yourBranch}
}

which renames the current branch to something like replaced_master_98d258f.


May want to include git stash pop in that workflow. If you want to re-apply your stashed files.
What do you do with stashed branch? I'm afraid it'll pop up again somewhere in the future long after I've forgotten what it was for.
@ScottBiggs If you want to remove the stashed branch, use "git stash clear".
A
Amit Kaneria

It can be done multiple ways, continuing to edit this answer for spreading better knowledge perspective.

1) Reset hard

If you are working from remote develop branch, you can reset HEAD to the last commit on remote branch as below:

git reset --hard origin/develop

2) Delete current branch, and checkout again from the remote repository

Considering, you are working on develop branch in local repo, that syncs with remote/develop branch, you can do as below:

git branch -D develop
git checkout -b develop origin/develop

3) Abort Merge

If you are in-between a bad merge (mistakenly done with wrong branch), and wanted to avoid the merge to go back to the branch latest as below:

git merge --abort

4) Abort Rebase

If you are in-between a bad rebase, you can abort the rebase request as below:

git rebase --abort

k
ksol

You can do as @Hugo of @Laurent said, or you can use git rebase to delete the commits you want to get rid off, if you know which ones. I tend to use git rebase -i head~N (where N is a number, allowing you to manipulate the last N commits) for this kind of operations.


Actually it was the 'git rebase' command that messed the whole thing up, then some forced merges and hard resets.. Anyway, what I was looking for is just some easy way of pulling the whole repo from remote server without merging.
T
Tom Stickel

The selected answer is absolutely correct, however it did not leave me with the latest commit/pushes ...

So for me:

git reset --hard dev/jobmanager-tools
git pull  ( did not work as git was not sure what branch i wanted)

Since I know I want to temporarily set my upstream branch for a few weeks to a specific branch ( same as the one i switched to / checked out earlier and did a hard reset on )

So AFTER reset

git branch --set-upstream-to=origin/dev/jobmanager-tools
git pull
git status    ( says--> on branch  dev/jobmanager-tools 

A
Arsen Khachaturyan

If you want to update branch that is not currently checked out you can do:

git fetch -f origin rbranch:lbranch

k
kamal

git checkout .

i always use this command to replace my local changes with repository changes. git checkout space dot.


E
Eugene Kaurov

As provided in chosen explanation, git reset is good. But nowadays we often use sub-modules: repositories inside repositories. For example, you if you use ZF3 and jQuery in your project you most probably want them to be cloned from their original repositories. In such case git reset is not enough. We need to update submodules to that exact version that are defined in our repository:

git checkout master
git fetch origin master
git reset --hard origin/master
git pull

git submodule foreach git submodule update

git status

it is the same as you will come (cd) recursively to the working directory of each sub-module and will run:

git submodule update

And it's very different from

git checkout master
git pull

because sub-modules point not to branch but to the commit.

In that cases when you manually checkout some branch for 1 or more submodules you can run

git submodule foreach git pull

Please provide an explanation, especially when answering questions this old. Your answer is not helpful as-is.
The accepted answer already proposes git reset --hard. This adds little value.
T
Travis Heeter
git reset --hard
git clean -fd

This worked for me - clean showed all the files it deleted too. If it tells you you'll lose changes, you need to stash.


D
Danylo V

git fetch origin remote_branch git reset --hard FETCH_HEAD


Your answer is not adding anything that was not already suggested by the numerous older answers.
H
Hugo

The ugly but simpler way: delete your local folder, and clone the remote repository again.


Or just delete the branch and check it out again.
Yep, I guess thats what I'm gonna do if I dont find how to do it in a less 'ugly' way
Ugly is sometimes useful to know. I do wish people wouldn't downvote things just because they're not the conventional way: there must be a more rational reason for downvoting... and it should be given. Git is a thing which achieves results. It is not some kind of sacred text.
I don't understand the downvotes :-( Yes, it is inelegant, etc. but it can work best in some cases... sorry @Hugo
@Hugo, Agreed. Something mysterious and smelly happened to my local develop branch, and both the Team Lead and Engineering Manager suggested, among more elegant solutions, to just (zip, copy, and save my feature work, then) nuke the local repo and reclone.