How should one handle merge conflicts when working on long running feature branches?Anonymous·Sep 28, 201714