Error at fetch

[rhs0266]

I followed

!/usr/bin/env bash

Usage: ./fetch-homework.sh

Make sure that upstream points to the valid offical repository.

git remote rm upstream git remote add upstream https://github.com/snu-sf/pl2015.git

Download and update.

git fetch upstream git merge upstream/master

as same as snu-sf/pl2015/fetch-homework.sh

but I got some problem @ git merge upstream/master. Here is error error: 'merge' is not possible because you have unmerged files. hint: Fix them up in the work tree. hint: and then use 'git add/rm ' as hint : appropriate to mark resolution and make a commit, hint: or use 'git commit -a'. fatal: Exiting because of an unresolved conflict.

How can I solve this problem?

[jeehoonkang]

Short answer: follow the hint.

• git status to check your repo's status. You may have "unmerged files" as said in the error message.
• git add [UNMERGED FILE], git commit -m [COMMIT MESSAGE], and then retry fetch-homework.sh.

Long answer: Read Git manual and Stack Overflow posts.

• http://try.github.io
• http://stackoverflow.com/questions/5772908/trouble-merging-upstream-changes-back-into-my-branch

[rhs0266]

Thx! "git commit -a"