Skip to main content

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

Required fields*

2
  • 1
    +1 The other suggestions for using Git better are good, but actually talking to the other developers about merge conflicts is another key aspect to develop OP's effectiveness. Commented Aug 20, 2018 at 15:41
  • 1
    "You can see the history" Maybe! Depends how squashed & rebased everything is :P Commented Aug 22, 2018 at 10:43