Versions Compared

Old Version 48

changes.mady.by.user Tim Donohue

Saved on

compared with

New Version 49

changes.mady.by.user Hardy Pottinger

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: changed the instructions for checking out a maintenance branch

...

  1. First, make sure you have the release branch (e.g. 'dspace-4_x') set up correctly in your local repo. It needs to be setup to "track" the branch in the "upstream" repo (read above on how to configure an upstream repository)

    Code Block
    # confirm you have set upstream correctly
git remote -v
 
# should output something like:
# origin	git@github.com:yourgithubname/DSpace.git (fetch)
# origin	git@github.com:yourgithubname/DSpace.git (push)
# upstream	git@github.com:DSpace/DSpace.git (fetch)
# upstream	git@github.com:DSpace/DSpace.git (push)
 
# then check out the release branch
git checkout dspace-4_x
 
# should output something like:
# Branch dspace-4_x set up to track remote branch
    Code Block
    # run one time only, to get the branch to your local repo.
git checkout --track -b dspace-4_x upstream/from upstream.
# Switched to a new branch 'dspace-4_x'
  2. Create a Pull Request for the "master" branch. The easiest way to do this is to create it via GitHub.
  3. After your Pull Request has been reviewed and approved, make sure it is merged into the "master" branch.  The merger will result in two separate commits - the original change itself and the merge commit. Make sure you know the hash of the original commit.
  4. Use git cherry-pick to add the original commit to the release branch:

...