Skip to content

Update at 2025-12-10-17-24 #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 1 commit into from
Dec 10, 2025
Merged

Update at 2025-12-10-17-24 #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...
Expand All @@ -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: