antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 13 Projects Releases 5 Activity Actions

Clean up code with Copilot #134

Open
tobi wants to merge 2 commits from clean-up-code-with-copilot into main
pull from: clean-up-code-with-copilot
merge into: antville:main
Conversation 0 Commits 2 Files changed 38 +541 -591
tobi commented 2025-04-25 15:45:10 +00:00
Owner
Copy link
No description provided.
Remove Eclipse-specific markers (comments)
All checks were successful
Build / build (push) Successful in 33s
Details
a9f02635f1
tobi self-assigned this 2025-04-25 15:48:00 +00:00
tobi force-pushed clean-up-code-with-copilot from a9f02635f1
All checks were successful
Build / build (push) Successful in 33s
Details
to 10b0e0e2b7
All checks were successful
Build / build (push) Successful in 8s
Details
2025-05-25 15:34:46 +00:00 Compare
All checks were successful
Build / build (push) Successful in 8s
Details
This pull request has changes conflicting with the target branch.
  • src/main/java/helma/main/ApplicationManager.java
  • src/main/java/helma/main/JettyServer.java
  • src/main/java/helma/servlet/AbstractServletClient.java
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin clean-up-code-with-copilot:clean-up-code-with-copilot
git switch clean-up-code-with-copilot

Merge

Merge the changes and update on Forgejo.
git switch main
git merge --no-ff clean-up-code-with-copilot
git switch clean-up-code-with-copilot
git rebase main
git switch main
git merge --ff-only clean-up-code-with-copilot
git switch clean-up-code-with-copilot
git rebase main
git switch main
git merge --no-ff clean-up-code-with-copilot
git switch main
git merge --squash clean-up-code-with-copilot
git switch main
git merge --ff-only clean-up-code-with-copilot
git switch main
git merge clean-up-code-with-copilot
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
blocker

   
core

   
dependency
Pull request that updates a dependency file

  
major

   
needs-work

   
runtime

   
security

   
urgent
No labels
blocker
core
dependency
major
needs-work
runtime
security
urgent
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
tobi
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
antville/helma!134
No description provided.