Resolving conflits during pull request using intellij

Question

My team uses individual feature branches for each developer, then merge the code to develop branch through a pull request and then merge the develop branch to testing branch through a pull request.

I know if multiple developers are working on a single branch and pushing their code, in case they get a conflict, intellij would automatically pop up the conflict resolution windows, which we can easily use to accept the required changes from respective commits.

I have been trying to use the same intellij option for merge conflicts in a pull request from develop to testing. Is it possible to do so. I have referred some intellij docs but none of them address this issue. I am using bitbucket stash, if it helps.

Answer 1

Check if IntelliJ IDEA does support git rerere, which would allows you to reuse conflict resolutions from one PR merge step to the next.

The other approach would be to:

• refuse merging any PR with conflict
• force a local rebase (or local merge probably, since rebase a common branch like develop or testing is not convenient) in order to resolve conflicts locally.
• make a new PR from the updated branch, this time without conflicts, since they were resolved locally in the previous step.