Git merge question

I was trying to merge a branch, and got this error:

lv@machine:~/bp (integration)$ git merge aarp-perks
warning: Failed to merge submodule app/plugins/surveys (commits not present)
Auto-merging app/plugins/surveys
CONFLICT (submodule): Merge conflict in app/plugins/surveys
Automatic merge failed; fix conflicts and then commit the result.

so I did a gitstatus:

lv@machine:~/bp (integration)$ git status
# On branch integration
# Changes to be committed:
#      modified:   app/plugins/bp_events
# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#      both modified:      app/plugins/surveys
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#   (commit or discard the untracked or modified content in submodules)
#      modified:   app/plugins/bp_events (untracked content)

Anyone know how I can resolve this so that I can merge the branch I am working on? I am new to this.
Who is Participating?
JESiiConnect With a Mentor Commented:
Try using:
   git mergetool
this opens your default diff program (or prompts you to select one if you haven't already) and then helps you figure out how to resolve the merge conflict (on app/plugins/surveys). Here's a link about that:

Also, here's a terrific (free) book about git by Scott Chacon - highly recommended! Here's the section on branching and merging:
lvollmerAuthor Commented:
is there anyway to just overwrite the files on my machine with the latest copy of the repository?
lvollmerAuthor Commented:
actually, that is easier then i thought it would be. thanks for the link.
All Courses

From novice to tech pro — start learning today.