Bitbucket Cloud: Diffstat has more possibles states #940
Conversation
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
Conflicts due to file deletion and file rename were not convered, yet. According to my tests conflicts due to file addition get marked as "merge conflict". Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Contributor
Author
|
Sadly, the documentation is completely worthless in this instance since it only has documentation for the normal commit diffstats, but no additional documentation for the merge diffstats. https://developer.atlassian.com/cloud/bitbucket/rest/api-group-pullrequests/#api-repositories-workspace-repo-slug-pullrequests-pull-request-id-diffstat-get just links to https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commits/#api-repositories-workspace-repo-slug-diffstat-spec-get |
gonchik
pushed a commit
that referenced
this pull request
Sep 3, 2022
Conflicts due to file deletion and file rename were not convered, yet. According to my tests conflicts due to file addition get marked as "merge conflict". Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Conflicts due to file deletion and file rename
were not convered, yet. According to my tests
conflicts due to file addition get marked as
"merge conflict".
Signed-off-by: Frank Lichtenheld frank@lichtenheld.com