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.

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

new repo with untouched readme file #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

sshurie
Copy link
Member

@sshurie sshurie commented Jan 29, 2016

OK maybe this time

@ninjapanzer
Copy link
Member

\o/ PERFECTO!

@ninjapanzer
Copy link
Member

The issue here is when you modify a shared file and then merge your PR it could cause a conflict blocking someone else from automated merging of their PR. In the real world who cares you resolve the conflict and thats life. But here just yet I want to avoid those troubles and make it seem that git and life is super easy.

@sshurie
Copy link
Member Author

sshurie commented Jan 29, 2016

Oh okay! thanks for the help with that mess

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants