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

conflict resolution #11

Open
hwick opened this issue Aug 13, 2024 · 0 comments
Open

conflict resolution #11

hwick opened this issue Aug 13, 2024 · 0 comments

Comments

@hwick
Copy link
Contributor

hwick commented Aug 13, 2024

not everyone gets a merge conflict resolution message on GHD. I think this depends on how the conflict is resolved (local kept vs remote kept vs both) -- may want to investigate and have a note in case this comes up during the lesson
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@hwick