Page History

...

At this point, if you have any conflicts between your local changes and the latest changes on GitHub, git will prompt you to resolve these conflicts.

If you have any questions contact the DSpace community either on IRC, or on the dspace-devel mailing list.

Contributing Changes/Patches to DSpace via GitHub

The DSpace Developers are still working to complete our migration from SVN to GitHub. While we're still working out the ideal workflow for contributions, existing Committers will have direct push access to the DSpace GitHub repo, while contributors are encouraged to submit a Pull Request for review.If you have any questions contact the DSpace community either on IRC, or on the dspace-devel mailing list.

A few notes on creating a proper "Pull Request"

1. Please, make sure to create a "Pull Request" from a branch. (you'll understand exactly why after reading #2)
2. Be warned that any changes/commits you make to that branch before the "Pull Request" is accepted/merged, will immediately be included in that existing Pull Request. This means that, if you want to continue your local development, you must create that "Pull Request" from a semi-static branch (so that any additional commits you make in the meantime don't get included as part of the existing "Pull Request").
   • The reason why this occurs is that a "Pull Request" just points at a specific "branch" (the branch it was initialized from). It does NOT point at a specific set of commits. So, when the "Pull Request" is accepted/merged, you are pulling in the latest version of that "branch". For more information, closely read the GitHub help page on Pull Requests
3. Once your "Pull Request" is created, you can use the GitHub Pull Request tools to communicate with the Committer who is assigned to the Pull Request. If further changes are requested, you can make those changes on the branch where you initiated the Pull Request (and those changes will automatically become part of the Pull Request, as described above)