DEP

Dobisel Enhancement Proposals

Read first

• Power of plain text
• Unix Way
• Conventions

Contribution

All contributers of a repository should first add their ssh-key to their settings->SSH/GPG Keys and do this for contribution:

• Make a fork of that repository.
• Get clone of your forked repository.

git clone <forked-remote>

• Also add main repository to your git working copy remotes as upstream.

git remote add upstream <main-remote>

• Create a branch for each issue, feture, as follow:

  • feature/foo
  • fix/loginwhenuserisinactive
  • try/withkernel6

• Make your changes and commit the changeset. Then push changes to your forked repository.

• Every commit message must contains issue numbers(s), i.e

  • Fix: Prevent login when user is deactivated. closes #78.
  • Fix: Foo problem. closes #65 and also closes repo/bar#29.
  • Feature: Create /tokens REST API. needs more tests #74

• Make pull request from your local branch to original repository.

• Pull request title should be inclusive, exclusive and describe content of the changeset.

For update your repositories with upstream:

• Fetch all remote repositories.

git fetch --all

• Then rebase the origin.

git rebase -i upstream/master

• If there is any conflict, fix them.
• Then push them to your fork.

git push origin master 

Use --force if you know what you are doing.

NOTE
Git's output messages is the most favourit cookbook for git. read them carefully.