Workarounds for Git rebase, pull, and push cannot merge after conflict

We often encounter conflicts when we use Git rebase, pull, and push, and this is when we go to merge:

$ git rebase Master

A conflict occurred:

$ git mergetool-t opendiff

Then use Opendiff to manually merge the conflicting places.

However, today I met the situation that cannot merge, the problem is as follows:

$ git mergetool-t opendiff

$ No files need merging

Tip I do not need to merging files, Google found the solution, generally there are two kinds:

The first type:

$git Config--global core.trustctime false

The explanation of the above statement is:

If false, the CTime differences between the index and the working copy are ignored; Useful when the inode was regularly modified by something outside Git (file system crawlers and some backup sys tems). And Core.trustctime are true by default.

So, directly set to false, nothing serious, as long as the content of the code is consistent there is no problem.

The second type:

$git rebase--skip

You can skip directly, because no files need to be merging, stating that the conflict is not on the contents of the file.

Problem solving.