CODEWITHSUNDEEP
gitgithubversion-controlpull-requestconflict
AG_HIHI
AG_HIHI

Reputation: 1995

Github: Marking conflict as resolved does not merge the changes

I have done a PR and now I am resolving a conflict on Github.
After fixing the conflict I click on Mark as resolved:
enter image description here It says that the conflict has been resolved:
enter image description here But, when I refresh the conflicts page, I see that the conflict is still there, as if I haven't changed anything:
enter image description here Any idea, what's going-on?

Upvotes: 1

Views: 1678

Answers (1)

torek
torek

Reputation: 487725

I have not used the GitHub "resolve a conflict without using Git yourself" web page, but its documentation says that you must click "commit merge" before the conflicts will actually be resolved. This makes a lot of sense for internal-to-Git reasons.

It does seem as though simply reloading the page should preserve resolutions-so-far, so that you just keep going. To make this work well, though, GitHub will need to store some sort of information in your browser (cookies, etc.); blocking this will cause the reload to lose track of what you have done so far.

I would recommend learning to use command-line Git, rather than poking about with these web interfaces, which are invariably poorer than the Git tooling. The paucity of abilities that the web interfaces provide are a significant part of the reason the web interfaces are easier to use (just as it's easier to drive an automatic transmission car, than a manual-transmission one, for instance: since there is that much less you can do, there is that much less that you have to do).

Upvotes: 3

Related Questions