Issue driven git process for organizational people

Care

• Don't rebase to master
• Don't push your commit to master directly
• Use pull request

To keep our clean repository

1. Select issue

2. Get latest commits from Github

$ git checkout master && git pull origin master

or

$ git clone [email protected]:darkonhub/darkon.git

3. Checkout new branch in your workspace (ex, issue-97)

$ git checkout -b issue-97

4. Coding & commit

$ git commit -m "change message"

5. Pull latest master code to your local master branch

$ git checkout master && git pull origin master

6. Comeback working branch

$ git checkout issue-97

7. Rebase from master

$ git rebase master

7-1. If you faced conflict, you have to solve it.

# solve conflicted part ...

$ git add {{ conflicted files }}
$ git rebase --continue

8. Push your code

$ git push origin issue-97

9. Make pull request in Github

Reference

Git-Branching-Rebasing