vendor.conf: reserve space for downstream projects#1834
Merged
vdemeester merged 1 commit intodocker:masterfrom Apr 15, 2019
Merged
vendor.conf: reserve space for downstream projects#1834vdemeester merged 1 commit intodocker:masterfrom
vdemeester merged 1 commit intodocker:masterfrom
Conversation
This helps merge conflicts in situations where downstream projects have additional dependencies. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Member
Author
|
ping @silvin-lubecki @vdemeester I think this will help me when updating our ee-repositories, as this line will give git a good marker to resolve conflicts |
Member
Author
Codecov Report
@@ Coverage Diff @@
## master #1834 +/- ##
=======================================
Coverage 56.73% 56.73%
=======================================
Files 308 308
Lines 21610 21610
=======================================
Hits 12261 12261
Misses 8449 8449
Partials 900 900 |
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
5 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.
This helps merge conflicts in situations where downstream
projects (such as Docker EE) have additional dependencies.