Provide name of conflicting repository#25
Open
berenddeboer wants to merge 1 commit intoeiffelhub:masterfrom
Open
Provide name of conflicting repository#25berenddeboer wants to merge 1 commit intoeiffelhub:masterfrom
berenddeboer wants to merge 1 commit intoeiffelhub:masterfrom
Conversation
Contributor
Author
|
BTW, the documentation led me to believe you can actually have the same package name in a repository twice. See "Using your own IRON packages locally". There an example is given where you have to select the repository. But the code does not seem the support this. |
jocelyn
reviewed
Sep 9, 2018
| end | ||
| if l_has_conflict then | ||
| print (" [conflict!] ") | ||
| if l_has_conflict and then attached l_package_names.item (p.item.identifier) as l_earlier_package then |
Member
There was a problem hiding this comment.
I would do
if l_has_conflict then
if attached l_package_names.item (p.item.identifier) as l_earlier_package then
print (" [ignoring this package as it is also listed in the " + l_earlier_package.repository.location_string + " repository!] ")
else
print (" [Conflict!] ")
end
otherwise, the conflict may not be reported... even if it is likely that l_earlier_package is set.
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
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.
Better error message in case of conflicts.