Eric0627 / Landlords

A Landlords game innovated by Chinese working people in Command Line

Landlords pokercard game

Collaboration Guide

We have two main branches in the git repository:

• master: for stable version of code
• dev: for development version of code

You can follow the following:

1. Fork this repository to your own account.
2. Clone this repository to your local machine.
3. Import project from your local repo (you should import Landlords/Landlords as your project folder)
4. Create a new feature branch (for example, poker) for your own development. You can do it in Eclipse.
5. You can edit code and do several commits on your own branch (for example, poker).
6. When it's time to push your modification to the Github, you can checkout to your local dev branch and merge/rebase from your own branch (for example, poker). Then, fetch the latest remote branches master & dev from upstream, that is, the original repo, to avoid your modification conflicting with others' code already push to the remote/dev or remote/master (you can find it in Eclipse. You can follow the session 4 of Github团队项目合作流程). Then, you can push the local dev branch to your fork repo and make a pull request from your dev branch to the dev branch of the original repository. This procedure is trying to make a clearer git commit history.

Note:

• if you would like to get the latest development version of code, please checkout to dev branch. Branch master may not be the newest.
• before you push, remember to fetch from the upstream first.

Recommanded softwares:

• Github Desktop
• SourceTree # You can visualize the git actions.

Highly Recommanded Readings:

• 廖雪峰：多人协作
• wiki: dou dizhu
• 编程语言中常用的变量命名缩写