Now, even as an individual, CoDiff (https://CoDiff.com) can boost your productivity by notifying you as soon as your local changes conflict with upstream commits. Conversely, if you do not see a conflict marker on your files within CoDiff, you can rest assured that you will be able to push or pull without any merge conflicts -- guaranteed.
In addition, we’ve fixed all of the cross-platform bugs that were reported to us - again, thank you everyone for your feedback!
We’d love if you could give our product a try and submit feedback right here, within CoDiff itself, or by emailing us at [email protected].