$ git checkout omod-common/src/main/java/org/openmrs/module/webservices/rest/we
b/api/impl/RestServiceImpl.java
error: path 'omod-common/src/main/java/org/openmrs/module/webservices/rest/web/a
pi/impl/RestServiceImpl.java' is unmerged

patandre@USRYMRPATANDRE ~/workspace/openmrs-module-webservices.rest (sprint-2013
02)
$ git status
# On branch sprint-201302
# Your branch is ahead of 'upstream/sprint-201302' by 76 commits.
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   omod/src/test/java/org/openmrs/module/webservices/rest/web/v
1_0/controller/openmrs1_8/PersonAttributeControllerTest.java
#