42

When you are working on a feature and someone else is working on the same thing and you commit at the same time and now you have to resolve conflicts but both versions work

Comments
Add Comment