Guest User

Untitled

a guest
Feb 26th, 2013
65
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.63 KB | None | 0 0
  1. $ git add omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/contr
  2. oller/openmrs1_8/PersonAttributeControllerTest.java
  3.  
  4. patandre@USRYMRPATANDRE ~/workspace/openmrs-module-webservices.rest (sprint-2013
  5. 02)
  6. $ git commit -m "RESTWS-333"
  7. U omod-common/src/main/java/org/openmrs/module/webservices/rest/web/api/im
  8. pl/RestServiceImpl.java
  9. error: 'commit' is not possible because you have unmerged files.
  10. hint: Fix them up in the work tree,
  11. hint: and then use 'git add/rm <file>' as
  12. hint: appropriate to mark resolution and make a commit,
  13. hint: or use 'git commit -a'.
  14. fatal: Exiting because of an unresolved conflict.
Advertisement
Add Comment
Please, Sign In to add comment