One way to merge in these changes is to pull them into a local
branch for review, verifying the changes and then merge to back
to master.
# Check out a new branch for integration
git checkout -b merge-requests/6
# Fetch the merge request into this branch
git pull \
git://git.sugarlabs.org/irc/mainline.git \
refs/merge-requests/6
# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit master..merge-requests/6
# To apply the changes to your branch:
git checkout master
git merge merge-requests/6
git push origin master
Add a new comment:
Login or create an account to post a comment