Skip to content

Conversation

@Vedant1202
Copy link
Contributor

Added a draft for contribution guidelines and pull request template.

@cjchirag7
Copy link
Contributor

@Vedant1202 , this looks nice ! We really needed a contributing.md
but you may wish to change the base of your PR to develop branch, as mentioned in the developer guide ( See README.md )

@Vedant1202
Copy link
Contributor Author

@cjchirag7 Thanks for the review. There is no change in the system as such it's just an addition as a documentation context. If it's reviewed and passed by the maintainers, I think merging into master should'nt be a problem.
Also, since contributions are forked and branched from the default branch, ie, master, and github even displays the default branch when someone visits the repo, I guess adding it directly to the default branch would be much more better.

@Vedant1202
Copy link
Contributor Author

@cjchirag7 I have however, missed adding the line where you've to request to pull a merge into the develop branch in the contrib file. I'll do that.

@birm birm changed the base branch from master to develop April 14, 2020 13:10
Copy link
Contributor

@cjchirag7 cjchirag7 left a comment

Choose a reason for hiding this comment

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

@Vedant1202 , please consider these changes, if it seems correct.

@Vedant1202
Copy link
Contributor Author

@cjchirag7 I've made the changes, thanks for the suggestions.

@birm
Copy link
Member

birm commented Apr 15, 2020

Hi, thanks for putting this together.
I'd recommend the PR template to go to https://github.com/camicroscope/.github so it applies to all caMicroscope repos.
The biggest thing that I think needs discussion/consideration is the workflow we're using. I think we're somewhere between the link you posted and gitflow, since we removed the release branch but kept the develop. I think there's merit to removing develop and just use tags. But I don't want to make that decision unilaterally.

@Vedant1202
Copy link
Contributor Author

@birm I have shifted PR template to .github.
I saw a discussion is opened on PR-366, so I guess we'll have to wait until we get to a conclusion over there?

@birm
Copy link
Member

birm commented Apr 15, 2020

I think it's ok to discuss here or in the issue. I just don't want to forget to actually do a release this week, before there are too many changes. (Also, as you pointed out, the contributing guidelines don't go into effect until we merge)

@birm
Copy link
Member

birm commented Apr 15, 2020

After talking with other contributors, It looks like we want to keep develop, so that checking out master is the same as checking out the latest release.

Copy link
Member

@birm birm left a comment

Choose a reason for hiding this comment

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

Looks good to me. I'll leave this up for just a little longer so that anyone else who wants to comment can.

@birm birm merged commit b8f58db into camicroscope:develop Apr 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants