adzenith questions

adzenith answers

• Beyond Compare - automatically merge "conflicted" files in working copy (if possible)
• How to add a user to a group without logout/login - Bash script
• How to revert a merge which used strategy=ours?
• How to use --color-words with git add --patch?