Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- $ git add omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/contr
- oller/openmrs1_8/PersonAttributeControllerTest.java
- patandre@USRYMRPATANDRE ~/workspace/openmrs-module-webservices.rest (sprint-2013
- 02)
- $ git commit -m "RESTWS-333"
- U omod-common/src/main/java/org/openmrs/module/webservices/rest/web/api/im
- pl/RestServiceImpl.java
- error: 'commit' is not possible because you have unmerged files.
- hint: Fix them up in the work tree,
- hint: and then use 'git add/rm <file>' as
- hint: appropriate to mark resolution and make a commit,
- hint: or use 'git commit -a'.
- fatal: Exiting because of an unresolved conflict.
Advertisement
Add Comment
Please, Sign In to add comment