Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Auto detect and merge lockfile conflicts #3544
referenced this pull request
May 31, 2017
This was referenced
Jun 5, 2017
One question: should we make this behavior opt-in via a