Show HN: Emissary – Rust implementation of the I2P protocol stackgithub.com3 points·by altonen·anno scorso·0 comments
altonen·4 anni fa·discussYou can also use git-reflog to restore the branch back to the state it was before the merge. So instead of creating a temporary branch, you can inspect the reflog, find the entry before the merge commit and do git reset --hard HEAD@{X}.
altonen·5 anni fa·discussIf you use git-rerere you don't have to fix the same conflicts over and over again