We have to resolve the conflicts manually by merging the develop into feature branch. After the conflicts are resolved we could be able to merge the Pull request.
- Step 1: Checkout the feature branch and merge the respective changes from the target branch. Resolve conflicts.
- git checkout feature/branchName
- git pull origin develop
- Step 2: After the merge conflicts are resolved, stage >> commit >> push the changes accordingly.
- git commit
- git push origin HEAD
- Step 3: Merge the updated pull request.
Vinay's Notes 