Closed wedamija closed 11 hours ago
When two adjacent lines in the lockfile are changed git/github detects a merge conflict. An easy work around is to just add newlines in between each application
When two adjacent lines in the lockfile are changed git/github detects a merge conflict. An easy work around is to just add newlines in between each application