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

6. merge both feature branches into main #6

Open
MarleenEliza opened this issue Feb 24, 2022 · 0 comments
Open

6. merge both feature branches into main #6

MarleenEliza opened this issue Feb 24, 2022 · 0 comments

Comments

@MarleenEliza
Copy link
Owner

Conflictが起こるべきです。
newfileのfeatureブランチの全てを優先するようにしてください。
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
@MarleenEliza