1

The goal: Merge changes in develop from feature branch.

Easy enough, but the merge has conflicts. I used the conflict resolution tool on github. I resolved the conflicts. I got a warning that this would change develop. Nope. Do not want. Abort.

Research:

Started here: https://help.github.com/articles/about-merge-conflicts/

Read this: If your merge conflict is caused by competing line changes, such as when people make different changes to the same line of the same file on different branches in your Git repository, you can resolve it on GitHub using the conflict editor. For more information, see "Resolving a merge conflict on GitHub."

Lead here: https://help.github.com/articles/resolving-a-merge-conflict-on-github/

Read this: Warning: When you resolve a merge conflict on GitHub, the entire base branch of your pull request is merged into the head branch, even if the head branch is the default branch of your repository, like master, or a protected branch. Make sure you really want to commit to this branch.

What if you don't?

I want to resolve the conflict into my feature branch without altering the develop branch in any way.

How?

If I wanted to alter develop I would be merging in the other direction.

kowsky
  • 12,647
  • 2
  • 28
  • 41
Mark Andrews
  • 51
  • 5
  • I don't know the GitHub way, but you can as well merge `develop` to your feature branch locally and resolve conflicts there. This will create a merge commit on your feature branch, but you will be able to merge in GitHub without conflict. – kowsky Nov 15 '18 at 07:29
  • Possible duplicate of [How to resolve merge conflicts in Git](https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git) – Jasper de Vries Feb 14 '19 at 11:39
  • "If I wanted to alter develop I would be merging in the other direction." From your goal it seems like you want to merge feature branch into develop – Uzair Farooq Aug 27 '19 at 11:27

1 Answers1

4

Seems it isn't possible. It is quite clear that merging A into B on github will result in changes to A if there are merge conflicts. This makes absolutely no sense to me but is clearly documented.

The merge was done locally.

Mark Andrews
  • 51
  • 5