use annotations of the patchfile, if javamerge_override is set.#1490

Merged

maybeec merged 6 commits intodevonfw:masterfrom LarsReinken:430_Java_annotation_merge

May 10, 2022

+229-2

Commits on Mar 1, 2022

devonfw#430 use annotations of the patchfile, if javamerge_override is set.
LarsReinken
committed

Commits on May 3, 2022

Merge branch 'master' into 430_Java_annotation_merge
LarsReinken
committed

Commits on May 4, 2022

Commits on May 5, 2022

Update JavaMerger.java
LarsReinken
authored

Commits on May 10, 2022

Merge branch 'master' into 430_Java_annotation_merge
maybeec
authored