DEV Community

Discussion on: Git Staging Area: Explained Like I'm Five

Collapse
 
imben1109 profile image
Ben

How could you resolve conflict?

Collapse
 
offendingcommit profile image
Jonathan Irvin

Stare at the box. You feel compelled to argue with it. It wins. Every time.