Git Usage

[Antony]

Since we are using Git to manage this project and I have some experience (since I use it at work programming in both Java and Progress), I wanted to share what I think would be some best collaborative practices to contribute code for this project.

If you are a direct contributor:

This means that Mercury and Maarten really like and trust you. You have direct access to the repository and can make changes at ANY TIME. There is the master branch, a Development branch, and a QA branch. Once you have access, immediately clone the master branch to your machine. That will of course bring the latest working build down to you. This usually happens when you clone to your desktop from the git site. 

Next, you want to create a branch named Development, and do a pull to retrieve the latest development code. This code probably isn't ready for production, more than likely a nightly build.

If you have an idea for something in NightDOS, create a LOCAL repository on your machine. I'd strongly suggest also creating a post in this group. That way we can have a discussion around your idea or concept. Work and test (and commit often just in case to your local repository) once you are satisfied with your code, send a notification to everyone on the collaborators team that you are ready to push code. To make identifying this easier, perhaps the subject can be PUSH NOTIFICATION to DEV for MyIdea, for example. This will alert everyone else that is looking at development that they will need to do a pull...

Anyways, to make sure you have updated development code, switch to the Development branch and do a pull. Hopefully there are no updates, but there may be some. After you pull, you want to merge from your private repository into Development. After a merge, then you push to upstream and then everyone else can see your code.

If you are not a contributor, then this link provides an idea on how the process will work.

[Antony]

http://www.git-scm.com/book/en/v2 Is the reference for Git

---

Git - Book