Problem with git flow - pull request merge conflict

Question

I think my problem is specific. We have following branches in our git development flow: develop - it's being deployed on test platform, all feature and bugs branches are being merged here and after QA accepts the solution, the feature or bug branch is being merged into stable branch, which is a base for a release package.

My problem is that I can't merge my accepted feature branch into stable, because JIRA shows merge conflicts on one file... I cannot merge develop into my branch because I don't want to have develop in stable. The conflicting file has been changed in other bug/feature branch many days before. I tried to cherry pick this change into my branch, but without success...

What can I do?

@edited

Now I observed that even when I create a fresh branch from stable and change the file, I have merge conflicts when trying to merge with develop!

At which point did `develop` diverge from `stable`? You can’t test `develop` to work correctly and then push out code from `stable` if it has different code in it. It hasn’t been tested in that case. — Sami Kuhmonen, Oct 28 '19 at 05:40

score 1 · Answer 1 · answered Oct 28 '19 at 05:43

I cannot merge develop into my branch because I don't want to have develop in stable.

You could merge it just to reproduce the conflict and resolve it for that one file.

Then abort the merge, but save the diff for that file (the conflict resolution) is a patch first.

You can then apply that patch to your current feature branch, and merge it to stable.

Problem with git flow - pull request merge conflict

1 Answers1