Comment Comment by luketheobscure Should be titled "How to create conflicts with every commit". parent luketheobscure 12 years ago