Resolve merge conflicts: Force overwrite all files

Question

I am working on a git repository by myself (so yes, I know the implications and the warnings of doing this) and somehow one of the trees got a commit after being pushed

Answer 1

There are three simple solutions to copy the last version that is in you remote repository, discarding all changes that you have made locally:

1. Discard your repository and clone again. This is the most simple solution, but if your repository is big, it can take a long time, and may require extra effort like reconfigureing, etc.

2. Discard the local changes with git reset --hard <hash> and then do a git pull. The problem is you need to first find a commit that precedes whatever change history you are trying to avoid. After resetting to that commit hash, do a git pull.

3. Do a git fetch to bring the updates to your local reference of the remote branch (usually origin/master) and then do a git reset --hard passing this reference, ie, git reset --hard origin/master.

Answer 2

git reset --hard {remote_repository_name}/{branch_name}

Example:

git reset --hard upstream/branch1

If you are working with a branch you can use the above code.But before that, you have to set (upstream or origin) to your local repository,

git remote add upstream https://github.com/lakini/example.git

here,https://github.com/lakini/example.git is the remote upstream repository.

Same as like this we can work in the remote repository(origin) as well.

git reset --hard origin/branch1