Skip to content

Instantly share code, notes, and snippets.

@andresaquino
Last active September 24, 2015 07:27
Show Gist options
  • Select an option

  • Save andresaquino/712513 to your computer and use it in GitHub Desktop.

Select an option

Save andresaquino/712513 to your computer and use it in GitHub Desktop.
Integration
# Check out a new branch for integration
git checkout -b integration
# Fetch the merge request into this branch
git pull git://gitorious.org/dpsync/mainline.git refs/merge-requests/1
# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit master..integration
# To apply the changes to your master branch:
git checkout master
git merge integration
git push origin master
and for Github, what's procedure?
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment