InEngineer the World for GoodbyPierre Barrau·Oct 23, 2017Git Merge conflicts resolution made easyIt’s the end of the day. You just finished some important work in your git feature branch. Your code is working beautifully. Unit tests are…