http://major.acetone.i2p/irc2p/i2p-dev/2025/02/24
dr|z3d you could just cherry-pick the commit(s) dr|z3d rebase, haven't really done much of that manually, though that's probably also an option. dr|z3d if you want to cherry-pick, get the commit id of the commits you want to merge, then switch to the branch you want to pull them into, then git cherry-pick {commit-id} dr|z3d to make the merge less painful, meld is recommended as your default diff/merge tool for git. dr|z3d to enable meld, you want something along the lines of the following...