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.

Sign up for GitHub

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

Jump to bottom

Clarify the steps for solving the merge conflicts #14971

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Clarify the steps for solving the merge conflicts #14971

wants to merge 1 commit into from

Conversation

f-alizada
Copy link
Contributor

Context

Based on the received feedback from:
dotnet/extensions#5295
dotnet/extensions#5256

Changes made

  • Updates are touching only the description of the PR and includes:
    • Adding git fetch for resolving conflicts section
    • Adding starting point pointed to the remote instead of local.

@f-alizada f-alizada mentioned this pull request Jul 23, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@f-alizada