Tree:
851f9240b7
2ndfactor
dependabot/maven/javafx-854041b8e6
develop
feature/1690-invalid-config-handling
feature/arm-x86-hybrid
feature/decrypt-name-window
feature/dynamic-languages
feature/errordb-array
feature/exe-cache-msis
feature/files-in-use
feature/hyperlink-resource
feature/patched-win-jdk
feature/preferences-network
feature/prototpye-restore-vaultconfig
feature/refactor-vault
feature/restore-vaultconfig
feature/self-update-poc
feature/sign-locally
feature/smooth-charts
feature/spinning-spinner
feature/tmp-event-view
feature/translations
feature/vault-name-as-id
fix/2270-assertion-error-in-catching-executors
main
refactoring/error-report-abstraction
refactoring/error-report-cleanup
release/1.17.0
release/1.17.1
support-windows-arm64
1.17.1
1.17.0
1.17.0-beta1
1.16.2
1.16.1
1.16.0
1.16.0-beta2
1.15.3
1.15.2
1.16.0-beta1
1.15.1
1.15.0
1.15.0-beta1
1.14.2
1.14.2-beta1
1.14.1
1.14.0
1.14.0-beta2
1.14.0-beta1
1.13.0
1.13.0-beta1
1.12.4
1.12.3
1.12.3-beta1
1.12.2
1.12.1
1.12.0
1.11.1
1.11.1-beta1
1.11.0
1.11.0-beta2
1.11.0-beta1
1.10.1
1.10.0
1.10.0-beta3
1.9.4
1.10.0-beta2
1.9.3
1.9.2
1.10.0-beta1
1.9.1
1.9.0
1.9.0-beta1
1.8.0
1.7.5
1.7.4
1.7.3
1.7.2
1.7.1
1.7.0
1.7.0-rc2
1.7.0-rc1
1.7.0-beta3
1.7.0-beta2
1.7.0-beta1
1.6.17
1.7.0-alpha2
1.6.16
1.7.0-alpha1
1.6.15
1.6.14
1.6.13
1.6.12
1.6.11
1.6.10
1.6.9
1.6.8
1.6.7
nightly
1.6.6
1.6.5
1.6.4
1.6.3
1.6.2
1.6.1
1.6.0
1.6.0-rc3
1.6.0-rc2
1.6.0-rc1
1.6.0-beta4
1.6.0-beta3
1.6.0-beta2
1.5.19
1.5.18
1.5.17
1.6.0-beta1
1.6.0-alpha2
1.6.0-alpha1
1.5.16
1.5.15
1.5.14
1.5.13
1.5.12
1.5.12-beta1
1.5.11
1.5.10
1.5.9
1.5.9-beta2
1.5.9-beta1
1.5.8
1.5.7
1.5.6
1.5.5
1.5.4
1.5.3
1.5.2
1.5.1
1.5.0
1.5.0-rc3
1.5.0-rc2
1.5.0-rc1
1.5.0-beta3
1.5.0-beta2
1.5.0-beta1
1.4.17
1.5.0-alpha2
1.5.0-alpha1
1.4.16
1.4.15
1.4.14
1.4.13
1.4.12
1.4.12-rc2
1.4.12-rc1
1.4.11
1.4.11-rc2
1.4.11-rc1
1.4.10
1.4.10-rc1
1.4.9
1.4.8
1.4.7
1.4.6
1.4.6-beta1
1.4.5
1.4.5-beta1
1.4.4
1.4.3
1.4.2
1.4.1
1.4.0-rc1
1.4.0
1.4.0-beta3
1.4.0-beta2
1.4.0-beta1
continuous
1.3.5
1.3.4
1.3.3
1.3.2
1.3.1
1.3.0
1.3.0-rc9
1.3.0-rc8
1.2.5
1.3.0-rc7
1.3.0-rc6
1.3.0-rc5
1.3.0-rc4
1.3.0-rc3
1.3.0-rc2
1.3.0-rc1
1.2.4
1.2.3
1.2.2
1.2.1
1.2.0
1.1.4
1.1.3
1.1.2
1.1.1
1.1.0
1.0.5
1.0.4
1.0.3d
1.0.3c
1.0.3b
1.0.3
1.0.2
1.0.1
1.0.0
0.11.0
0.10.1
0.10.0
0.9.0
0.8.2
0.8.1
0.8.0
0.7.2
0.7.1
0.7.0
0.6.0
0.5.3
0.5.2
0.5.1
0.5.0
0.4.0
0.3.0
0.2.0
0.1.0
Sebastian Stenzel
99fce8d0b7
automatically resolve conflicts for directory files, that contain the same directory ID
|
9 years ago | |
|---|---|---|
| .. | ||
| main | 99fce8d0b7 automatically resolve conflicts for directory files, that contain the same directory ID | 9 years ago |
| test | 99fce8d0b7 automatically resolve conflicts for directory files, that contain the same directory ID | 9 years ago |