I really like the integration between RStudio and Git. The only thing I miss is something that can help you dealing with merge conflict. I think that having a tool to help the developer to handle this situation would be pretty useful (something similar to waht you can find in IntelliJ). What dou you think?