Activate the new GitHub feature: Contributing Guidelines #2376

Closed
wants to merge 1 commit into
from

Conversation

Projects
None yet
3 participants
@b-durand
Contributor

b-durand commented Sep 17, 2012

This add a link when a contributor creates an issue or opens a pull
request.
More details on https://github.com/blog/1184-contributing-guidelines.

Activate GitHub feature: Contributing Guidelines
This add a link when a contributor creates an issue or opens a pull
request.
More details on https://github.com/blog/1184-contributing-guidelines.

@ghost ghost assigned weierophinney Sep 18, 2012

@weierophinney

This comment has been minimized.

Show comment Hide comment
@weierophinney

weierophinney Sep 18, 2012

Member

Should wait until #2373 is merged.

Member

weierophinney commented Sep 18, 2012

Should wait until #2373 is merged.

@b-durand

This comment has been minimized.

Show comment Hide comment
@b-durand

b-durand Sep 21, 2012

Contributor

There is no murder, but @Maks3w I don't understand why you don't use my commit, and recommit my commit... I do not think this is the right way to merge a PR IMHO.

Contributor

b-durand commented Sep 21, 2012

There is no murder, but @Maks3w I don't understand why you don't use my commit, and recommit my commit... I do not think this is the right way to merge a PR IMHO.

@weierophinney

This comment has been minimized.

Show comment Hide comment
@weierophinney

weierophinney Sep 21, 2012

Member

@b-durand We're following git-flow. The workflow for those of us merging is:

  • Create a local fix branch
  • Pull the PR into that branch and verify; perform any additional changes necessary (fix CS issues, etc.)
  • If it's against master:
    • git checkout master && git merge --no-ff # and indicate the PR you're closing in the merge commit
    • git checkout develop && git merge --no-ff # and indicate the PR you're forward porting
  • If it's against develop, we simply do the second step from above

This process helps ensure that when we merge develop to master for the next minor release, the history will be clean. @Maks3w was using your commit; he was simply doing a merge commit when doing so.

Member

weierophinney commented Sep 21, 2012

@b-durand We're following git-flow. The workflow for those of us merging is:

  • Create a local fix branch
  • Pull the PR into that branch and verify; perform any additional changes necessary (fix CS issues, etc.)
  • If it's against master:
    • git checkout master && git merge --no-ff # and indicate the PR you're closing in the merge commit
    • git checkout develop && git merge --no-ff # and indicate the PR you're forward porting
  • If it's against develop, we simply do the second step from above

This process helps ensure that when we merge develop to master for the next minor release, the history will be clean. @Maks3w was using your commit; he was simply doing a merge commit when doing so.

@Maks3w

This comment has been minimized.

Show comment Hide comment
@Maks3w

Maks3w Sep 21, 2012

Member

@b-durand I didn't use your commit because was in conflict after merge @weierophinney commit. Seriously Are we discuss for rename a file?

Member

Maks3w commented Sep 21, 2012

@b-durand I didn't use your commit because was in conflict after merge @weierophinney commit. Seriously Are we discuss for rename a file?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment