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

Add branching scheme to contribution guidelines #696

Merged
merged 10 commits into from
Oct 20, 2017

Conversation

tburny
Copy link

@tburny tburny commented Sep 29, 2017

Summary of changes: As per Discussion on gitter we updated the contribution guidelines with our branching scheme in order to help new contributors get started quickly.

@coveralls
Copy link

coveralls commented Sep 29, 2017

Coverage Status

Coverage remained the same at 71.942% when pulling 046fe27 on update-contributing-md into eed159c on master.

@coveralls
Copy link

coveralls commented Sep 29, 2017

Coverage Status

Coverage remained the same at 71.942% when pulling d36a1ce on update-contributing-md into eed159c on master.

@bmuenzenmeyer
Copy link
Member

This needs to target dev

@bmuenzenmeyer bmuenzenmeyer changed the base branch from master to dev October 1, 2017 09:40
@bmuenzenmeyer
Copy link
Member

Some conflicts have arisen due to some other edits. Please review - I am excited for this!

@tburny
Copy link
Author

tburny commented Oct 8, 2017

this stale bot is really annoying

@tburny tburny reopened this Oct 8, 2017
@stale stale bot removed the needs response label Oct 8, 2017
Tobias Brennecke added 2 commits October 8, 2017 13:27
# Conflicts:
#	.github/CONTRIBUTING.md
@tburny tburny requested a review from bmuenzenmeyer October 8, 2017 11:31
@coveralls
Copy link

Coverage Status

Coverage remained the same at 71.947% when pulling f4039a6 on update-contributing-md into 2bd4a47 on dev.

2 similar comments
@coveralls
Copy link

Coverage Status

Coverage remained the same at 71.947% when pulling f4039a6 on update-contributing-md into 2bd4a47 on dev.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 71.947% when pulling f4039a6 on update-contributing-md into 2bd4a47 on dev.

@tburny
Copy link
Author

tburny commented Oct 8, 2017

Tried my best to resolve all conflicts. let me know if something is missing/wrong.

@coveralls
Copy link

coveralls commented Oct 8, 2017

Coverage Status

Coverage remained the same at 71.947% when pulling f4039a6 on update-contributing-md into 2bd4a47 on dev.

@bmuenzenmeyer
Copy link
Member

@tburny with dev-3.0 now merged into dev, we can safely remove that branch in favor of a simpler scheme.

@bmuenzenmeyer bmuenzenmeyer mentioned this pull request Oct 18, 2017
14 tasks
Copy link
Member

@bmuenzenmeyer bmuenzenmeyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove mention of dev-3.0 from branches and image

@coveralls
Copy link

coveralls commented Oct 18, 2017

Coverage Status

Coverage decreased (-1.8%) to 70.141% when pulling ac55c0f on update-contributing-md into 2bd4a47 on dev.

@bmuenzenmeyer bmuenzenmeyer self-assigned this Oct 19, 2017
Copy link
Member

@bmuenzenmeyer bmuenzenmeyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is pretty slick! Thanks for keeping track with updates.

Would it be too much trouble to switch from bower to npm?

@bmuenzenmeyer bmuenzenmeyer added the hacktoberfest 🌾 https://hacktoberfest.digitalocean.com label Oct 20, 2017
@coveralls
Copy link

coveralls commented Oct 20, 2017

Coverage Status

Coverage decreased (-1.8%) to 70.141% when pulling bc32046 on update-contributing-md into 2bd4a47 on dev.

@bmuenzenmeyer bmuenzenmeyer merged commit 165f2d1 into dev Oct 20, 2017
@bmuenzenmeyer bmuenzenmeyer deleted the update-contributing-md branch October 20, 2017 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement ✨ hacktoberfest 🌾 https://hacktoberfest.digitalocean.com
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants