Page History

...

rebase: the process by which you cut off the changes made in your local branch, and graft them onto the end of another branch. For more information, see Pro-Git's chapter on Rebasing and GitHub's 'rebase' page.

Some useful Git Development Guidelines

The DSpace Developers/Committers are still working on our Git Guidelines & Best Practices.

But in the meantime, here's some development guidelines from a few "third parties" (feel free to add additional links)

• Very widely used & popular model: "A successful Git branching model" ('git-flow' branching model)
  • There are also "git-flow" tools available at: https://github.com/nvie/gitflow^{Image Added} These tools give you quick ways to create the various types of branches described in the above model (release / feature / hotfix branches)
• Chris Wilper's "How I Use Git"A successful Git branching model (gitflow branching model) (This actually contradicts some of Chris's suggestions, but is a different perspective to a development perspective based off the above "gitflow" model)
• Fedora Developers' Git Guidelines and Best Practices (not all are Fedora specific) - this is how they approach development in Git

Getting Started with DSpace + Git

...