{"componentChunkName":"component---src-pages-markdown-remark-fields-slug-js","path":"/engineering/git-pull-force/","result":{"data":{"markdownRemark":{"id":"b6b7417c-1baa-5d47-8d97-0704d063a25d","excerpt":"It is fine when you and the rest of your team are working on different files. But sometimes, multiple people simultaneously work on the same files, and that's…","html":"

It is fine when you and the rest of your team are working on different files. But sometimes, multiple people simultaneously work on the same files, and that's where the problems arise.

\n

Just a Note: git pull = git fetch + git merge

\n

In this scenario, when you have local changes in your system and you pull the latest contribution, you got this error.

\n

error: your local changes to the following files would be overwritten by merge: readme.md\nplease commit your changes or stash them before you merge.\nAborting...

\n

Now you have 2 major choices

\n

Choice 1: you want to keep local changes

\n

git stash (stash the local changes clean the workspace)\ngit pull (pull the latest changes from remote )\ngit stash apply (apply the latest stash)

\n

-----------(or)---------------

\n

git fetch (fetch the local machine folder)\ngit stash (stash the local changes clean the workspace)\ngit merge '@{u}' (merge the changes from local folder to workspace folder)\ngit stash pop (apply the latest stash )

\n

By default, the stash changes will become staged. If you want to unstage them, use git restore --staged (git ver > 2.25.0).

\n

Choice 2: you do not want the local changes

\n

git reset --hard HEAD (reset to the head means remove all local changes)\ngit pull (get the latest changes)

\n

-----------(or)---------------

\n

git fetch (fetch the local machine folder)\ngit reset --hard HEAD (reset to the head means remove all local changes)\ngit merge '@{u}' (merge the changes from the local folder to workspace folder)

\n

git pull --force

\n

Now you must be thinking, what is git pull --force then?

\n

it feels like it would help to overwrite local changes. instead, it fetches forcefully but does not merge forcefully (git pull --force = git fetch --force + git merge).

\n

Like git push, git fetch allows us to specify which local and remote branch we want to work on. git fetch origin/ft-1:my-ft means the changes in the ft-1 branch from the remote repository will end up visible on the local branch my-ft. When such kind of operation modifies the existing history, it is not allowed by the Git without an explicit --force parameter.

\n","headings":[{"value":"Now you have 2 major choices","depth":2},{"value":"Choice 1: you want to keep local changes","depth":3},{"value":"Choice 2: you do not want the local changes","depth":3},{"value":"git pull --force","depth":2}],"fields":{"slug":"/engineering/git-pull-force/"},"frontmatter":{"metatitle":null,"metadescription":null,"description":"How to Overwrite Local Changes With Git Force Pull","title":"How to Perform a Git Force Pull","canonical":null,"date":"December 03, 2020","updated_date":null,"tags":["git"],"coverImage":{"childImageSharp":{"fluid":{"aspectRatio":1.5037593984962405,"src":"/static/496c8e02b6dc1da7410a55bf50a19942/701ee/pull.jpg","srcSet":"/static/496c8e02b6dc1da7410a55bf50a19942/3dcee/pull.jpg 200w,\n/static/496c8e02b6dc1da7410a55bf50a19942/ae6ae/pull.jpg 400w,\n/static/496c8e02b6dc1da7410a55bf50a19942/701ee/pull.jpg 800w,\n/static/496c8e02b6dc1da7410a55bf50a19942/8c3c2/pull.jpg 1200w","sizes":"(max-width: 800px) 100vw, 800px"}}},"author":{"id":"Abhimanyu Singh Rathore","github":"abhir9","bio":"He is a fun-loving technocrat, artist, photographer, nature lover, leisure traveler, and developer. He actively develops full-stack apps and programs in Go and various JavaScript frameworks and libraries, especially React.","avatar":null}}}},"pageContext":{"id":"b6b7417c-1baa-5d47-8d97-0704d063a25d","fields__slug":"/engineering/git-pull-force/","__params":{"fields__slug":"engineering"}}},"staticQueryHashes":["1171199041","1384082988","1711371485","1753898100","2100481360","229320306","23180105","528864852"]}