Read more

git: How to forget a recorded resolution

Arne Hartherz
January 30, 2014Software engineer at makandra GmbH

If you recorded Show archive.org snapshot a bad fix for a conflict, you can tell git to forget that bad resolution:

git rerere forget your_file.rb
Illustration web development

Do you need DevOps-experts?

Your development team has a full backlog? No time for infrastructure architecture? Our DevOps team is ready to support you!

  • We build reliable cloud solutions with Infrastructure as code
  • We are experts in security, Linux and databases
  • We support your dev team to perform
Read more Show archive.org snapshot

Afterwards, the badly resolved file will still be in your working directory. To get it back with confict markers, say:

git checkout -m your_file.rb

Resolve the conflict again, properly now. ;)

Posted by Arne Hartherz to makandra dev (2014-01-30 17:13)