CODEWITHSUNDEEP
gitgit-rerere
Eugen Konkov
Eugen Konkov

Reputation: 25143

rerere: how to view original conflict after `autoresolution`?

After merging I get next log:

git merge --no-ff feature/seamless_registration 
Auto-merging cpanfile
CONFLICT (content): Merge conflict in cpanfile
Auto-merging bin/myapp
CONFLICT (content): Merge conflict in bin/myapp
Resolved 'bin/myapp' using previous resolution.
Resolved 'cpanfile' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.

After this I can view how this merge conflicts are resolved:

$git diff cpanfile
...

But how can I view original merge conflict?

man git rerere seems has no such command

Upvotes: 1

Views: 83

Answers (1)

IrLED
IrLED

Reputation: 448

git checkout -m cpanfile should return the file to pre-conflict-resolution state

Upvotes: 0

Related Questions