Add list of files to merge conflict error#538
Merged
Conversation
Contributor
|
Maybe store that in the error's user info ? |
Member
Author
|
Yeah true, will fix that. |
Member
|
I'm inclined to say that we should leave doing this in the users' hand. They may very well want a different error message, want it localized, etc. |
Contributor
|
Depends. It seems the index where conflicts originated is not accessible externally, so you'll have to perform the pull by hand afterward to get the conflicted list. |
Member
Author
|
Yep, exactly My intention. To get the list of files we have to rebuild the pull feature. |
Member
|
Eh, yeah, fair enough. |
joshaber
added a commit
that referenced
this pull request
Jan 27, 2016
Add list of files to merge conflict error
Member
Author
|
@joshaber I will do another PR that sets the conflicted files in the user info? |
Member
|
Yep that's be great! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Currently we only return
Merge conflict, pull abortedwhen a merge conflict is detected while pulling this enumerates the conflicted files and returnsMerge conflict in files: index.html, _includes/head.html. Pull aborted..Enumeration should be ok as it is most likely run in a background thread anyway. What do you think?