$ git rebase -i HEAD~2 --onto origin/TP2AV-67-Rewrite-fieldSet
Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/mapper/DropdownValueMapper.java
CONFLICT (content): Merge conflict in rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/mapper/DropdownValueMapper.java
Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/impl/FieldSetServiceImpl.java
CONFLICT (content): Merge conflict in rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/impl/FieldSetServiceImpl.java
Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/impl/FieldServiceImpl.java
CONFLICT (content): Merge conflict in rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/impl/FieldServiceImpl.java
Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/impl/DropdownValueServiceImpl.java
Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/FieldSetService.java
CONFLICT (content): Merge conflict in rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/FieldSetService.java
Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/FieldService.java
Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/DropdownValueService.java
CONFLICT (content): Merge conflict in rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/service/DropdownValueService.java
Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/repository/FieldSetRepository.java
CONFLICT (content): Merge conflict in rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/repository/FieldSetRepository.java
Auto-merging rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/repository/DropdownValueRepository.java
CONFLICT (content): Merge conflict in rp-dynamic-form-server/src/main/java/hu/tsm/rp/dynamic/form/server/repository/DropdownValueRepository.java
Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/field/Field.java
CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/field/Field.java
Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/ShortTextDropdownValue.java
CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/ShortTextDropdownValue.java
Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/LongTextDropdownValue.java
CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/LongTextDropdownValue.java
Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/LongDropdownValue.java
CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/LongDropdownValue.java
Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DropdownValue.java
CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DropdownValue.java
Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DoubleDropdownValue.java
CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DoubleDropdownValue.java
Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DatetimeDropdownValue.java
CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DatetimeDropdownValue.java
Auto-merging rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DateDropdownValue.java
CONFLICT (content): Merge conflict in rp-dynamic-form-data-model/src/main/java/hu/tsm/rp/dynamic/form/model/domain/dropdown/value/DateDropdownValue.java
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
tree.
error: could not apply 27b10e8... REST endpoints to save and modify dynamic data values

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

Could not apply 27b10e8... REST endpoints to save and modify dynamic data values