Give more information about merge conflicts #1056
Merged
Conversation
This file contains 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
jennybc
approved these changes
Mar 18, 2020
R/git-utils.R
Outdated
| "There are {length(conflicted)} conflicted files:", | ||
| paste0("* ", conflicted_path) | ||
| )) | ||
| ui_stop("Please fix, stage, and commit to continue") |
There was a problem hiding this comment.
This PR is definitely progress. But we could also mention git merge --abort as a way to back out, while we're at it.
There was a problem hiding this comment.
I also wondered if we should use edit_file() to open these files for editing?
There was a problem hiding this comment.
I'm going to try it, and we can back off it seems too annoying.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.