Hacker News new | ask | show | jobs
by efreak 157 days ago
`git add .; git merge continue` also "solves" the conflict