DEV Community

Discussion on: How Do I Resolve Merge Conflicts?

Collapse
 
sickpuppysoftware profile image
Matt King

Just be glad you didn't use Microsoft Visual SourceSafe. The merging was ok for the time but having to chase down someone on holiday to unlock a checked out file was a nightmare. Then the "database" would corrupt.

Collapse
 
blackgirlbytes profile image
Rizèl Scarlett

LOL I'm grateful I never experienced that