From f928a49447ee171d46a8a739599d86000ce08965 Mon Sep 17 00:00:00 2001 From: Tobias Grothe Date: Wed, 10 Dec 2025 17:24:59 +0100 Subject: [PATCH] Update at 2025-12-10-17-24 Update Readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 338ecbd..eb11e5d 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ To use this template, click the "Use this template" button on the repository pag git checkout -b update-from-template # cherry-pick... git fetch https://github.com/tgrothe/java-template.git main && git cherry-pick FETCH_HEAD +# resolve possible conflicts, continue, commit... # see changes to push before push git diff origin/main # push... @@ -22,4 +23,4 @@ git push # git fetch https://github.com/tgrothe/java-template.git main && git diff FETCH_HEAD ``` -_By the way: A "pull ... --allow-unrelated-histories" would also be possible, but this affects the history, and causing chaos. :S_ +_By the way: A `pull ... --allow-unrelated-histories` would also be possible, but this affects the history, and causing chaos._ :cold_sweat: