SHARE
TWEET

Untitled

a guest Aug 23rd, 2019 215 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. $ git rebase -i HEAD~2 --onto origin/TP2AV-67-Rewrite-fieldSet
  2. Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/mapper/DropdownValueMapper.java
  3. CONFLICT (content): Merge conflict in rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/mapper/DropdownValueMapper.java
  4. Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/impl/FieldSetServiceImpl.java
  5. CONFLICT (content): Merge conflict in rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/impl/FieldSetServiceImpl.java
  6. Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/impl/FieldServiceImpl.java
  7. CONFLICT (content): Merge conflict in rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/impl/FieldServiceImpl.java
  8. Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/impl/DropdownValueServiceImpl.java
  9. Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/FieldSetService.java
  10. CONFLICT (content): Merge conflict in rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/FieldSetService.java
  11. Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/FieldService.java
  12. Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/DropdownValueService.java
  13. CONFLICT (content): Merge conflict in rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/DropdownValueService.java
  14. Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/repository/FieldSetRepository.java
  15. CONFLICT (content): Merge conflict in rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/repository/FieldSetRepository.java
  16. Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/repository/DropdownValueRepository.java
  17. CONFLICT (content): Merge conflict in rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/repository/DropdownValueRepository.java
  18. Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/field/Field.java
  19. CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/field/Field.java
  20. Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/ShortTextDropdownValue.java
  21. CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/ShortTextDropdownValue.java
  22. Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/LongTextDropdownValue.java
  23. CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/LongTextDropdownValue.java
  24. Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/LongDropdownValue.java
  25. CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/LongDropdownValue.java
  26. Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DropdownValue.java
  27. CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DropdownValue.java
  28. Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DoubleDropdownValue.java
  29. CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DoubleDropdownValue.java
  30. Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DatetimeDropdownValue.java
  31. CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DatetimeDropdownValue.java
  32. Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DateDropdownValue.java
  33. CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DateDropdownValue.java
  34. CONFLICT (modify/delete): rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/BooleanDropdownValue.java deleted in HEAD and modified in 27b10e8... REST endpoints to save and modify dynamic data values. Version 27b10e8... REST endpoints to save and modify dynamic data values of rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/BooleanDropdownValue.java left in
  35. tree.
  36. error: could not apply 27b10e8... REST endpoints to save and modify dynamic data values
  37.  
  38. Resolve all conflicts manually, mark them as resolved with
  39. "git add/rm <conflicted_files>", then run "git rebase --continue".
  40. You can instead skip this commit: run "git rebase --skip".
  41. To abort and get back to the state before "git rebase", run "git rebase --abort".
  42.  
  43. Could not apply 27b10e8... REST endpoints to save and modify dynamic data values
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top