How to work with Git


I do not have a problem, I want your experience from using git with NR.

We are having the following difficulties:

  1. When conflicts emerge, is there a way of resolving them through the UI ?
  2. Our NRs are built on demand. When we build a new one, we can see the origin branches. But we cannot find something like a 'git fetch' button in the UI to have these branches locally. Is there any way to fetch remote branches ?

If you use any practical UI plugins for Git, please share it. It might help us a lot.

Thanks in advance.