Sandeep Panda

co-founder, Hashnode

Sep 28, 2017

I agree with Cho, Yongjoon. It's best to avoid introducing conflicts in the first place. However, that's not possible always. For simple conflicts, the GUI based diff is sufficient. For more complex cases, I sit down with the other developer and try to fix the conflict. This is just to make sure I don't accidentally delete anything.

PV

Petru Vasile Avram

Solving my enigma

Sep 28, 2017

Definitely this. Also, if you're in a position where you need to do code review, you can try and plan the code reviews so that you can rebase onto the feature branch you reviewed so that you have knowledge of both branches. If you use git be mindful of the usage of git rebase—it's powerful but it can hurt you, so generally don't use it if you tend to have in depth code reviews that result in a lot of changes and if you tend to have long-running feature branches.

Search Hashnode