Link to proto conflicts FAQ and update go_repository doc [skip ci] (#285)

Related #1548
Related #1629
2 files changed