mpls-conf: T915: Added documentation for LDP import and export #387
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
Added examples for the new import and export functionality that LDP is now getting.
|
Hi, would you please resolve the conflicts. |
Most certainly, but it doesn't say to me what is conflicting. Are you able to see the conflicts? |
|
i merged a big change yesterday and the file you changes have an other location now. I think you don't pull the changes before your commit. |
|
Ahh yes that would do it. Should I close this PR, rebase, re-PR? |
|
Will close PR, and rebase, and submit another. Give me a little bit. |
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.
Added examples for the new import and export functionality that
LDP is now getting on vyos/vyos-1x#639