Once upon a time, I’ve decided to contribute to an open source project written in Go. I thought no problem, fork it, make a change then pull request. Sounds good, but it wasn’t such a smooth experience.
Мой вольный перевод статьи Painless merge conflict resolution in Git.