Simple Python library to perform a 3-way merge between strings, based on diff-match-patch. This library performs merges at a character level, as opposed to most VCS systems, which opt for a line-based ...
One of the projects I’m working on uses Bitbucket Cloud. Changes are made via pull requests. Unfortunately, Bitbucket only does non-fastforward merges when you merge a pull request via web interface, ...