Home

How to merge upstream changes from lite-hmrc in to icms-hmrc

Check remote branches:
git remote -v

origin git@github.com:uktrade/icms-hmrc.git (fetch)
origin git@github.com:uktrade/icms-hmrc.git (push)

Add the remote upstream if upstream isn't there (Do this once)
git remote add upstream https://github.com/uktrade/lite-hmrc.git

Fetch upstream changes:
git fetch upstream

create a branch of the upstream master changes:
git checkout -b upstream-master
git reset --hard upstream/master

Create a branch that we will merge into icms-hmrc:
git checkout -b merge-master

push this branch to remote:
git push --set-upstream origin merge-master

Create a new pull request for this branch and merge it to the master branch in the github UI:
https://github.com/uktrade/icms-hmrc/pull/new/merge-master

Delete the local branches now the changes have been merged:
git br -d merge-master upstream-master

NOTES:

• Conflicts must be resolved locally