ConE: A concurrent edit detection tool for large scale software development
I&#x27;m curious what devs are doing about this right now. Sometimes I&#x27;ll pull and BAM gross merge conflicts. Is there a git command I could run first? A workflow to adopt? I feel like some new tool from an academic paper will never make it into my toolbox.