Merge Issue

[jessexu20]

Before you make a push to your own branch! Make sure you have the most updated version.
You should do as following..

1. commit all your changes in your own branch, but do not push into the origin.

    git add -A
    git commit -m "message"

1. check out into master and pull the updated version

   git checkout master
   git pull
   

2. check into your own branch and merge the master

   git checkout [branchName]
   git merge master
   

3. fix the conflicts files by find each file and decide which you want. Check the HEAD AND MASTER

4. commit the fix result and push into your own branch

   git add -A
   git commit -m "fix conflict" 
   git push origin [branchName]
   

[jessexu20]

@OliviaHY @Expo0911

[jessexu20]

If you haven't done anything yet.
just do the step 2.