JIYIK CN >

Git can be a little difficult for new users, and if one of your first tasks is to perform some kind of pull from a Git remote repository, we'll discover a possible way to get Git to overwrite some local files.

There is no doubt that Git is a very effective tool for managing the work of a team. There are some important principles that you need to understand to use Git smartly. The good news is that when you learn them correctly, you are likely to rarely encounter problems that you cannot get rid of.

We use a local repository, which is a remote repository with one or more branches in the normal Git workflow. A repository keeps all the records about a project, including its entire history and all its branches. A branch is a set of changes from an empty project to the current state.

When you work on local files and introduce new changes, you need to push your local changes to the remote repository, and all your work is available on your machine until your local changes are pushed to the remote repository. The problems start when a team is working on the same thing and wants to make changes in the same place.

pullBased on multiple operations, including fetching data from the remote branch and then merging its changes into the local repository. You can use the following command to perform the above operations manually.

git fetch
git merge origin/$CURRENT_BRANCH

When dealing with Git repositories, we have two main choices.

Keep local changes

In this case, when the uncommitted changes are important to you, there are two ways to perform them:

First, you can submit them, then apply git pull.

Secondly, you can stash them. To be precise, stash can be interpreted as we made a commit, but at that time it was not visible on your current branch, but we can access it through Git. In order to recover the stashed changes (which we did stash), we will use the command git stash pop. This command will remove the stash commit after placing the stashed changes, since we don't need it anymore.

git fetch (it will fetch the folder for the local machine)
git stash (it will stash the local changes)
git merge origin/$CURRENT_BRANCH (merge the changes from the local folder to workspace folder) 
git stash pop (it will do all stash to latest)

Force Git Pull to overwrite local files

In this case, you want to release all your uncommitted local changes. Sometimes, you modify a file just for experimentation, but after that, you realize that you don't want that change. Then, all you want is to update it upstream.

This will add an additional step between fetching and merging in this operation. It will therefore reset the branch to its original state, allowing git mergeto work.

git fetch (fetch the local machine folder)
git reset --hard HEAD (it will remove the local changes)
git merge origin/$CURRENT_BRANCH (merge the changes from the local folder to workspace folder)