Page Comparison

...

1. Merge the new tag 

   Code Block
   language bash
   # Follow the steps in Keeping Your Fork Up To Date # Checkout your vendor branch $ git checkout myschool-master # Merge in the changes that have been made up to uportal-4.0.6. NOTE: You don't specify upstream/uportal-4.0.6. That notation is for a branch not a tag. $ git merge uportal-4.0.6

2. Handle Merge Conflicts 

   Code Block
   language bash
   # Handle any merge errors that come up $ git mergetool -y

3. Test the changes with a local build and deploy

...