Git Branch Layout

[Stephen Lawrence]

The branching for the OpenDocMan project will be following what is discussed in this article:

http://nvie.com/posts/a-successful-git-branching-model/

Steve

[Phillip Jackson]

Thanks for the link - I promise to read it twice! LOL

[Phillip Jackson]

Stephen,

First of all, let me start off by saying that I truly appreciate the opportunity to contribute to this project. Secondly, let me apologize for the muck-up on the last pull request. Still getting my hands wrapped around the git workflow process, so... your patience(you haven't caught a plane down here to punch me in the face... yet!) has been a blessing. Now, with all the mushy crap out of the way... :)  

I have read through the above "git-branching" article, applied this to one of my own projects and just wanted to make clear the expected workflow for making further contributions to this project. Also, this might help others that want to contribute to the project as well and possibly in my same situation at the time. 

1. From the projects github page, https://github.com/opendocman/opendocman, click on the "Fork" button in the upper left of the page. 
2. Clone this fork, which now is only in my repositories online and not locally, directly to my local environment. Since I use the Windows Github app, that means I just click the icon for my Github repositories list (not local) and click on the "Clone" icon next to the "Opendocman" repository. This creates a new folder in my server directory titled "opendocman". 
3. Still within the Github app, I click back into my local repositories and enter the project by clicking the arrow to the right of the project name. 
4. With the project open in the app, I can now either choose the branch I want to work on or create a new branch (such as creating a new feature or picking up an issue that currently does not have a branch named for it)
5. Once I am in the appropriate branch, I can then open up the project in my editor and begin making changes. To keep things as clean and organized as possible, I should only make changes only relating to the issue I am working on. If I find an issue with something else or  see some other shiny thing I want to toy with... open up Notepad and make a note of it. Come back to this later.
6. Once the changes have been made and verified that everything is working, commit the files edited and sync your local repository. In the windows app, this is done by simply pressing the "Sync" icon at the top of the Commit area. Next, click the Publish button. The pushes the local changes to your online repository.
7. Back on the projects github page, press the button titled "Pull Request" at the top, located to the left of the "Fork" button. This will automagically see your changes from when you pressed the "publish" button and just follow the directions from there. 

If at this point, that bright shiny thing you found is making you sweet. Go back to step 4 and repeat until the perspiring stops. Does that about sum it up? If I have missed anything or you need to add anything, please let me know. 

Thanks again! Feedback and suggestions are most welcome

On Wednesday, May 9, 2012 11:46:39 PM UTC-5, Stephen Lawrence Jr. wrote:

[Elvina Zirima]

Hi Stephen,

I hope i find you well. I have been reading your posts here and i find them all very useful. I am new to OPENDOCMAN and have a few questions if you will indulge me?

Thanks,