Page Comparison

...

This will pull all new commits, branches, and tags that have been added to the github repo since your last fetch into your local repo.

Merge the Github changes into the local branch

Run the merge command to merge the contents of the Github 'master' branch into the current local branch.

git merge github/master

Push the new changes to GitLab

Run the following commands to push the new changes and tags to the GitLab server. New tags are not pushed by default, so the second command is necessary to sync those to the server.

git push origin kc-1606
git push origin --tags

Merge the changes within GitLab

Create a merge request on GitLab as described above, and merge the new branch into the master branch. The repo has now been synced with the Kuali Github repo, and the changes can be pulled down to your local repo using the 'git pull' command.

...