DEV Community πŸ‘©β€πŸ’»πŸ‘¨β€πŸ’»

Discussion on: How Do I Resolve Merge Conflicts?

Collapse
worc profile image
worc

+1 to calling in the other author you're conflicting with. on the command line a merge conflict looks and is arcane, cryptic, and math-heavy. but the reality is that it's just you and another person collaborating asynchronously.

Collapse
blackgirlbytes profile image
Rizèl Scarlett Author

You worded that well!