4. Collaborate (continuous development)

Pull the changes of others, so any merging problems with changes you are making would be clear. Do this by choosing VCS -> Git -> Pull and make sure you're pulling not from your own fork but from upstream (fesch/CanZE). You can pull as often as you like. If you don't see the upstream, visit the Issues page on this wiki. Notice the refresh button next to the Remote drop down list.

We strongly advice to only work in the development branch, or create your own feature branches.

Make your changes!!

Just before committing, do another pull from fesch/CanZE to detect and avoid colliding merges.

Commit by choosing VCS -> Commit Changes. Here you have a chance to inspect the differences. Please add a good description of what you changed. Any code warnings from files you did not modify you can ignore.

To push your commits (and maybe the ones you just pulled) to your own fork on Github, choose VCS -> Git -> Push. his means you are sending the latest pulls and your own commits to your own repository on github so others can use it.

If you're happy and think your changes can be incorporated, choose VCS -> Git -> Create Pull Request. This will send a message to Bob requesting the commits that you just pushed from your PC to your own repository on github to be merged in fesch/CanZE.