0 votes
1 view
in Azure by (12.8k points)

I've created pull request I got into this:

enter image description here

"Approve" button does nothing and complete is disabled.

How do I resolve this conflict in the pull request?

1 Answer

0 votes
by (9.6k points)

I hope this helps: click here

For difficult situations, you can do either one of them:

1. Resolve the conflict, reverse-integrate the changes from the target branch which will create additional merge commits 

2. Rebase on the target branch that will give you a clean history

Here is a plugin that will help: click

Welcome to Intellipaat Community. Get your technical queries answered by top developers !


Categories

...