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

Scenario: Rebase and resolve conflicts #9

Open
allanmoso opened this issue Oct 3, 2022 · 0 comments
Open

Scenario: Rebase and resolve conflicts #9

allanmoso opened this issue Oct 3, 2022 · 0 comments

Comments

@allanmoso
Copy link
Collaborator

allanmoso commented Oct 3, 2022 •
edited
Loading

Simulate a scenario where a branch is based on a branch that has changed significantly which results in a conflict. Ideally, the solution would be to rebase the branch and resolve any conflicts in it.
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
@allanmoso