altonen

4 ms·

1. 1.▲
   Show HN: Emissary – Rust implementation of the I2P protocol stack(github.com)

   3 points by altonen 2y ago|0 comments
2. 2.▲
   by altonen 5y ago

   You 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}.
3. 3.▲
   by altonen 5y ago

   If you use git-rerere you don't have to fix the same conflicts over and over again