I am trying to merge the devlop branch to release but it gives conflict.
It’s not allowed to do changes directly in either release or develop, all the changes have to be there in feature and then go to develop via a pull request and then to release via develop.
Somehow, there were chnages made directly to the release via a feature branch and those changes are tehre is develop as well but via a different feature.
I think this particluar commit in release is causing the merge conflict when raising a pr from develop to release for the new changes.
I folowed the steps mentioned in the above image, but since we cannot do teh changes directly in release or develop, I did the following –
- git checkout release
- git pull
- git checkout -b feature/resolveMergeConflict
- git pull origin develop
- resolved the conflicts manually
- git commit
- git push
- raised a pr from feature to develop
- raised a pr from develop to release – this is causing mereg conflict