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

Level: Rebasing Instead #290

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Level: Rebasing Instead #290

wants to merge 5 commits into from

Conversation

benthayer
Copy link
Owner

Fixes #261

@benthayer benthayer marked this pull request as draft August 15, 2020 02:11
@sahansk2
Copy link
Contributor

Heads up @benthayer , the Git Gud installation directory is untouchable during a merge conflict: https://gist.github.com/sahansk2/2c64aeff1e0edb4a23fc81395a818af5

@benthayer benthayer mentioned this pull request Sep 13, 2020
Merged
@benthayer benthayer changed the base branch from master to main November 26, 2020 19:10
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 6 - "Rebasing Instead"
2 participants
@benthayer @sahansk2