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

Section on handling merge conflicts... #17

Open
kellykapsar opened this issue Apr 4, 2024 · 0 comments
Open

Section on handling merge conflicts... #17

kellykapsar opened this issue Apr 4, 2024 · 0 comments

Comments

@kellykapsar
Copy link
Contributor

Was talking with a few people at the conference today and they made a good point that they didn't know what to do when conflicts did come up. I think our branching approach avoids some of this, but it might be worth just quickly touching base on what to do when merge conflicts arise.
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
@kellykapsar