News for hackers. Stuff that matters.
Re:Git undo: We can do better by cerved on Monday June 21, 2021 @02:32PM (#27582226)

  git mergetool
or

  git checkout --ours/theirs && git add .

There are no comments on this comment yet.