Synchronizing a local Git repository with a remote one

Question

I want to synchronize my local repository with a remote one so that my local repository becomes a 100  copy of the remote one - meaning that if certain files differ in these repositories  we override the local ones with the remote ones  and if there are files in local repositories that do not exist in the remote  the local files get removed   Is there any way to achieve that other than by doing a fresh clone of remote repository     Similar question as Sync local git repo with remote in one shot discarding local changes commits

User · Answer

The permanent fix if one wants to create a new branch on the remote to mirror and track your local branch(or, vice-versa) is:

git config --global push.default current

I always configure my local git with this command after I do git clone. Although it can be applied anytime when the local-remote branch "Git fatal: The current branch has no upstream branch" error occurs.

Hope this helps. Much peace. :)

User · Answer

Reset and sync local repository with remote branch  The command  Remember to replace origin and master with the remote and branch that you want to synchronize with   git fetch origin  amp  amp  git reset --hard origin master  amp  amp  git clean -f -d   Or step-by-step   git fetch origin git reset --hard origin master git clean -f -d   Your local branch is now an exact copy  commits and all  of the remote branch   Command output   Here is an example of running the command on a local clone of the Forge a git repository   sharkbook forge lbaxter  git fetch origin  amp  amp  git reset --hard origin master  amp  amp  git clean -f -d HEAD is now at 356cd85 FORGE-680 Removing forge-example-plugin  Removing plugin-container-api  Removing plugin-container  Removing shell  forge settings sharkbook forge lbaxter

User · Answer

You need to understand that a Git repository is not just a tree of directories and files  but also stores a history of those trees - which might contain branches and merges   When fetching from a repository  you will copy all or some of the branches there to your repository  These are then in your repository as  remote tracking branches   e g  branches named like remotes origin master or such   Fetching new commits from the remote repository will not change anything about your local working copy   Your working copy has normally a commit checked out  called HEAD  This commit is usually the tip of one of your local branches   I think you want to update your local branch  or maybe all the local branches   to the corresponding remote branch  and then check out the latest branch   To avoid any conflicts with your working copy  which might have local changes   you first clean everything which is not versioned  using git clean   Then you check out the local branch corresponding to the remote branch you want to update to  and use git reset to switch it to the fetched remote branch   git pull will incorporate all updates of the remote branch in your local one  which might do the same  or create a merge commit if you have local commits     But then you will really lose any local changes - both in working copy and local commits  Make sure that you really want this - otherwise better use a new branch  this saves your local commits  And use git stash to save changes which are not yet committed      Edit  If you have only one local branch and are tracking one remote branch  all you need to do is  git pull   from inside the working directory   This will fetch the current version of all tracked remote branches and update the current branch  and the working directory  to the current version of the remote branch it is tracking

User · Answer

If you are talking about syncing a forked repo then you can follow these steps   How to sync a fork repository from git   check your current git branch  git branch checkout to master if you are not on master  git checkout master Fetch the upstream repository if you have correct access rights  git fetch upstream If you are getting below error then run   git remote add upstream  git github com upstream clone repo url xyz git  fatal   upstream master  does not appear to be a git repository   fatal  Could not read from remote repository  Please make sure you have the correct access rights and the repository exists   Now run the below command   git fetch upstream Now if you are on master then merge the upstream master into master branch  git merge upstream master  That s it    Crosscheck via git remote command  more specific git remote -v  If I also have commit rights to the upstream repo  I can create a local upstream branch and do work that will go upstream there

User · Answer

These steps will do it   git reset --hard HEAD git clean -f -x -d -n   then without -n  This will take care of all local changes  Now the commits     git status   and note the line such as   Your branch is ahead of  xxxx  by N commits    Take a note of number  N  now   git reset --hard HEAD N git pull   and finally   git status   should show nothing to add commit  All clean   However  a fresh clone can do the same  but is much slow       Updated     As my git knowledge slightly improved over the the time  I have come up with yet another simpler way to do the same  Here is how   with explanation   While in your working branch   git fetch   This updates  remote  portion of local repo   git reset --hard origin  lt your-working-branch gt    this will sync your local copy with remote content  discarding any committed   or uncommitted changes    Although your local commits and changes will disappear from sight after this  it is possible to recover committed changes  if necessary

User · Answer

Sounds like you want a mirror of the remote repository   git clone --mirror url   to remote git local git   That command creates a bare repository   If you don t want a bare repository  things get more complicated

User · Answer

You want to do  git fetch --prune origin git reset --hard origin master git clean -f -d   This makes your local repo exactly like your remote repo   Remember to replace origin and master with the remote and branch that you want to synchronize with

User · Answer

You can use git hooks for that  Just create a hook that pushes changed to the other repo after an update    Of course you might get merge conflicts so you have to figure how to deal with them

User · Answer

git fetch --prune      -p  --prune      After fetching  remove any remote-tracking branches which no longer exist on the remote  prune options

User · Answer

This info is from The Git User s Manual   I m also learning  so this might not be exactly an answer to the question but it might help somebody    When a remote repository is initially cloned copies of all branches are stored in your local repository  view them with git branch -r  To update these copies and make them current  i e  sync them with the remote branch  use git fetch  This will not effect any of you existing  custom created branches  To override your local branch  checkout a fresh version of whatever branch you are working on  Assuming that you have already executed git add origin  path to repository  use git checkout origin branch name  this will override your locals changes on branch branch name

[git] Synchronizing a local Git repository with a remote one

Examples related to git