[tools] Improve error reporting when trying to create API/generator diff for a pull request with conflicts. - #3966
Merged
rolfbjarne merged 1 commit intoApr 20, 2018
Conversation
…iff for a pull request with conflicts. We can't create an API/generator diff for a pull request with conflicts, so detect this scenario and show a better error than this (from dotnet#3961): Comparing the changes between origin/pr/3961/merge^1 and HEAD: fatal: ambiguous argument 'origin/pr/3961/merge^1..HEAD': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' fatal: ambiguous argument 'origin/pr/3961/merge^1': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]'
dalexsoto
approved these changes
Apr 20, 2018
Contributor
Build success
|
rolfbjarne
added a commit
to rolfbjarne/macios
that referenced
this pull request
Jun 12, 2018
…iff for a pull request with conflicts. (dotnet#3966) We can't create an API/generator diff for a pull request with conflicts, so detect this scenario and show a better error than this (from dotnet#3961): Comparing the changes between origin/pr/3961/merge^1 and HEAD: fatal: ambiguous argument 'origin/pr/3961/merge^1..HEAD': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' fatal: ambiguous argument 'origin/pr/3961/merge^1': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]'
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.
We can't create an API/generator diff for a pull request with conflicts, so
detect this scenario and show a better error than this (from #3961):