-
Notifications
You must be signed in to change notification settings - Fork 280
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Create a merge commit when pulling/merging changes where all conflicts can be resolved automatically #639
Comments
Thanks for opening this. I think the best way to discuss this solution would be if you open a Pull Request so we can discuss it there. |
Thanks for your feedback - I'll try to write a test case that shows the scenario and open a pull request for that in the next few days. |
@ralfebert |
Given: A local branch and remote branch, both with commits. When merging those, all conflicts can be resolved automatically, for example because different files were changed locally and remote.
When such a situation is merged via
mergeBranchIntoCurrentBranch
(for example as part ofpullBranch
) in this situation, a merge conflict error will be thrown:https://github.com/libgit2/objective-git/blob/master/ObjectiveGit/GTRepository+Merging.m#L135
But then the conflicts are written to the index and this index might not have any conflicts because all conflicts were resolved automatically.
In this case, shouldn't the merge commit be created and the operation return without an error?
I tried to solve this, by instead of always returning with an error here: https://github.com/libgit2/objective-git/blob/master/ObjectiveGit/GTRepository+Merging.m#L148
I check if there are actually any remaining conflicts in the index that was written, and if not, I carry on creating the merge commit:
This seems to work, not sure if it's the correct solution that covers all cases that can happen in this situation...
The text was updated successfully, but these errors were encountered: