Git for Teams
You groan. Perhaps not audibly, but your eyes widen and then slowly shut with dread. After a lucky streak of merging feature branches without incident, you finally hit a Git merge conflict. Unsure of where to start, you sheepishly bring up Slack and direct message a plea for help. Maybe this has been you, or maybe you’ve just seen it happen. Either way, it means spending time untangling the code by yourself, or with the sympathetic assistance of another.