Repo for practicing developer workflow. Beginners welcome!
If you want help, post an issue or reach out to one of our contributors.
- Install Git
- Get a GitHub account
- Add your SSH Key to your GitHub account (to eliminate the need for passwords...)
Note: everything here was tested in Ubuntu 18.04 and will probably work on Mac. Setup a VM if necessary.
| Branch | Purpose |
|---|---|
| master | release branch |
| dev | development staging branch |
| dev_NAME | developer branch for WIP |
master is the trunk branch.
dev_NAME is the leaf branch.
'Merge Update' - from trunk branch to leaf branch
$ git checkout <leaf_branch>
$ git merge <trunk_branch>
'Merge Commit' - from leaf branch to trunk
$ git checkout <trunk_branch>
$ git merge --no-ff <leaf_branch>
Submit pull requests to the dev branch!
| Description | Command |
|---|---|
| show status | git status |
| create branch | git checkout -B <new_branch> |
| list remote branches | git branch -r |
| push new branch to remote | git push -u origin <new_branch> |
| fetch remote branch | git fetch origin <new_branch> |
| delete local branch | git branch -D <branchname> |
| delete remote branch | git push origin --delete <branchname> |