It’s a pity that it’s non-free, but the ideas behind SemanticMerge definitely need to be more widely known and implemented elsewhere. We can do so much better than line-by-line diffs.
$ ssh evildoer@anthony-backdoor.no-ip.org
evildoer@anthony-backdoor.no-ip.org's password:
Last login: Thu Oct 29 21:52:08 2015 from pool-200-26-34-39.nbrhm.fios.verizon.net
Welcome to Anthony's Personal Computer!
Obviously you should have access to this computer, or you wouldn't be using it.
Therefore, enjoy root access.
# echo "GODDAMNIT STOP PUSHING YOUR COMMITS!" > git.txt
# find / -type f | xargs -I{} cp git.txt {}
cp: 'git.txt' and '/root/git.txt' are the same file
# ^D
Connection to anthony-backdoor.no-ip.org closed.
$
It’s a pity that it’s non-free, but the ideas behind SemanticMerge definitely need to be more widely known and implemented elsewhere. We can do so much better than line-by-line diffs.
15) Go on the offensive.
Maybe I’m doing it wrong, but I find 0 mentions of rebase in the article.
Isn’t rebase a means of introducing, not resolving, conflicts? :) These all sound like things you’d do after rebase.
Eclipse has its own 3-way merge tool that I find very effective.