Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resolved conflicts #2589

Merged
merged 1 commit into from
Jan 11, 2023
Merged

resolved conflicts #2589

merged 1 commit into from
Jan 11, 2023

Conversation

kannankvs
Copy link
Collaborator

@kannankvs kannankvs commented Jan 10, 2023

Signed-off-by: kannankvs kannan_kvs@dell.com

This PR is with reference to PR#2435. Since the PR#2435 has branch conflict. Raising this new PR. Will close the PR#2435 once this PR is merged.

What I did

How I did it

How to verify it

Previous command output (if the output of a command-line utility has changed)

New command output (if the output of a command-line utility has changed)

Signed-off-by: kannankvs <kannan_kvs@dell.com>
@qiluo-msft
Copy link
Contributor

<<<<<<< clidoc_202205_update

This is not valid markdown. I think the commit contain unresolved git conflict.


Refers to: doc/Command-Reference.md:1 in fc56cd0. [](commit_id = fc56cd0, deletion_comment = False)

@xinliu-seattle xinliu-seattle merged commit 98dde31 into sonic-net:202205 Jan 11, 2023
@yxieca
Copy link
Contributor

yxieca commented Jan 12, 2023

@kannankvs, @xinliu-seattle this PR's title is not reflecting the change intended to make. The title described an action taken. Please use the correct PR title to reflect the change. Besides, what prevent you from make #2435 working for 202205 branch?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants