It happens in rare cases that either the remote or the local repository is out of date compared to the other and the fast forwarding merge wouldn’t work any more.
In such a situation, one needs a way to tell git to use the up to date version without having to manually revise each file and remove the stashing.
The ours option allows us to checkout the local version, and then commit the changes.
$ git checkout –ours .
The theirs option allows us to checkout the remote version, and then commit the changes.
$ git checkout –theirs .