[OPEN-ILS-DEV] commiting documentation changes from the branches of others into Evergreen repo

[Soulliere, Robert]

Hi Developers,

I have tested committing a change for the docs folder in the code repository. However I am a bit fuzzy on committing changes from the branches of other into the main repo. For example, bshum made did some asciidoc cleanup here:

http://git.evergreen-ils.org/?p=working/Evergreen.git;a=commit;h=af19fa6419e5328058338cada40b42a44b0522de

and I want to merge the changes into the repo. I don't think the changes have been merged yet? What appropriate steps are used to make that happen? Do I need to set up my own working branch, merge bshum's changes into my branch and then merge my branch into the master repo, or can I merge bshum's branch directly into the master branch?

Also, I am concerned about keeping track of these branched changes to ensure that they do not slip through the cracks as we get more contributors. Is there a recommended strategy for keeping up with contribution branches.

Thanks,
Robert


Robert Soulliere, BA (Hons), MLIS
Systems Librarian
Mohawk College Library
robert.soulliere at mohawkcollege.ca
Telephone: 905 575 1212 x3936
Fax: 905 575 2011

This E-mail contains privileged and confidential information intended
only for the individual or entity named in the message.  If the reader
of this message is not the intended recipient, or the agent responsible
to deliver it to the intended recipient, you are hereby notified that
any review, dissemination, distribution or copying of this communication
is prohibited.  If this communication was received in error, please
notify the sender by reply E-mail immediately, and delete and destroy
the original message.