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

feature/1-2 を feature/1 にマージする #2

Open
ykws opened this issue Oct 28, 2021 · 0 comments
Open

feature/1-2 を feature/1 にマージする #2

ykws opened this issue Oct 28, 2021 · 0 comments
Labels
conflict Try to resolve conflict rebase Try rebase

Comments

@ykws
Copy link
Owner

ykws commented Oct 28, 2021

feature/1-2 で feature/1 を rebase してから PR を作成します。
コンフリクトが発生するので、どちらの変更も有効になるように解消します。
@ykws ykws added rebase Try rebase conflict Try to resolve conflict labels Oct 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
conflict Try to resolve conflict rebase Try rebase
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@ykws