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

rebase を使わないでマージする #8

Open

ykws opened this issue Oct 28, 2021 · 0 comments

Labels

conflict

Owner

ykws commented Oct 28, 2021 •

edited

Loading

予め main の最新コミットから without-rebase branch を作成しておきます。

以下の順に PR を作成します。

feature/1-1 -> feature/1
feature/1-2 -> feature/1
feature/1 -> without-rebase
feature/2-1-1 -> feature/2-1
feature/2-1-2 -> feature/2-1
feature/2-1 -> feature/2
feature/2 -> main

ykws added the conflict label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment