Skip to content

Level: Merge Conflicts #286

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
Draft
benthayer wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Level: Merge Conflicts #286

benthayer wants to merge 3 commits into from

Conversation

@benthayer
Copy link
Owner

@benthayer benthayer commented Aug 14, 2020

Closes #250

Level currently works but has only default user messages

@benthayer benthayer changed the title Added new Merge Conflicts level Level: Merge Conflicts Aug 14, 2020
@benthayer benthayer mentioned this pull request Aug 14, 2020
Closed
@sahansk2
Copy link
Contributor

sahansk2 commented Aug 20, 2020

Comment: Running git gud reset in the middle of a merge conflict completely breaks the Git Gud installation to the point where the only way to fix it is to delete the Git Gud installation directory. git gud init --force and git gud init --force --pretty-please do nothing.

@benthayer benthayer changed the base branch from master to main November 26, 2020 19:11
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.

Level: Basics 7 - "Merge Conflicts"

3 participants

@benthayer @sahansk2