Hotfix vom 16.10. #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…-main Full text features main
Hotfixes 16.10.
…res-main 13.02.
|
Bitte schau aber vor dem Mergen mal kritisch drüber. Gut möglich, dass ich beim Lösen der Merge-Konflikte einen Fehler gemacht habe... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Lieber Chris, ich bekomme immer Merge-Konflikte angezeigt, wenn ich deine Weiterentwicklungen am
Full-text-features-mainBranch in den Branch des Testsystems mergen will. Die Gründe sind, dass wir einerseits verschiedene Base Branches für's Forken verwendet haben (dikastes/dfg-viewervs.slub/dfg-viewer) und andererseits in meinem Branch ein Hotfix drin ist, den wir letztes Jahr während einer VK live vorgenommen hatten, der aber offenbar nie den Weg zurück in deinen Branch gefunden hat.Hier deshalb ein PR, damit unsere Branches wieder auf demselben Stand sind und künftige Merges ohne Konflikte ablaufen.