## The problem You want to merge a [[Git]] remote repo with a local one, but their contents diverge, and rather than resolve each conflict individually, you want to either always keep the remote changes or always keep the local changes. ## The solution(s) ### Keep remote files ```shell # keep remote files git merge --strategy-option theirs ``` or ```shell git pull -Xtheirs ``` ### Keep local files ```shell # keep local files git merge --strategy-option ours ``` or ```shell git pull -Xours ``` ## References - [Stackoverflow](https://stackoverflow.com/questions/6650215/how-to-keep-the-local-file-or-the-remote-file-during-merge-using-git-and-the-com)