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

Update CONTRIBUTING file to match current practices. #362

Merged
merged 1 commit into from
Apr 12, 2016

Conversation

dwlehman
Copy link
Contributor

@dwlehman dwlehman commented Apr 7, 2016

You can see a preview of what it will look like here.

@dwlehman dwlehman added the 2.x label Apr 7, 2016
```
Take a look to make sure things are as expected, then...
```
git push
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this actually work? Maybe I have some different config, but just git push pushes only the current branch to its upstream. What I have to do is something like this git push origin master 2.0-devel 2.1-devel 3.0-devel.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That is an example of merging 2.0-devel to 2.1-devel. Maybe I should make that more clear.

@vpodzime
Copy link
Contributor

vpodzime commented Apr 8, 2016

Apart from the above question I'd like to ask why this document uses the markdown syntax while we use the ReST syntax everywhere else (AFAICT).

@vpodzime vpodzime mentioned this pull request Apr 8, 2016
@dwlehman
Copy link
Contributor Author

dwlehman commented Apr 8, 2016

I used markdown because I forgot that github will render the ReST nicely as well when people click the link when creating a pull request. I'll convert it.

@dwlehman
Copy link
Contributor Author

dwlehman commented Apr 8, 2016

I converted it to ReST and made it clear that that example was merging 2.0-devel into 2.1-devel.

I also added a note about release branches since it seems we're bringing them back.

@dwlehman
Copy link
Contributor Author

dwlehman commented Apr 8, 2016

Also updated demo version here (same link as before).

@vpodzime
Copy link
Contributor

Looks good to me. And since it is now ReST, I think it would be nice to add a table of contents to the beginning of the file, perhaps with depth=1?

I tried to make it much shorter to increase the
chances of people actually reading the whole thing.

I also converted it to ReST so it will render nicely
on github.
@dwlehman dwlehman merged commit 9a8c544 into storaged-project:2.0-devel Apr 12, 2016
@dwlehman dwlehman deleted the contributing-update branch April 12, 2016 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants