Olive/getch
Olive/getch
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases 3 Packages Wiki Activity

2.x #4

Open
eric wants to merge 5 commits from 2.x into trunk
pull from: 2.x
merge into: Olive:trunk
Conversation 0 Commits 5 Files changed 10 +425 -513
eric commented 2025-09-24 09:59:37 -07:00
Owner
Copy link
No description provided. 
Reviewed-on: #3
eric self-assigned this 2025-09-24 12:17:03 -07:00
This pull request has changes conflicting with the target branch.
  • README.md
  • functions.php
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 2.x:2.x
git switch 2.x

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch trunk
git merge --no-ff 2.x
git switch 2.x
git rebase trunk
git switch trunk
git merge --ff-only 2.x
git switch 2.x
git rebase trunk
git switch trunk
git merge --no-ff 2.x
git switch trunk
git merge --squash 2.x
git switch trunk
git merge --ff-only 2.x
git switch trunk
git merge 2.x
git push origin trunk
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Breaking Change
  
Kind/Breaking

Breaking change that won't be backward compatible

  
Kind/Bug

Something is not working

  
Kind/Documentation

Documentation changes

  
Kind/Enhancement

Improve existing functionality

  
Kind/Feature

New functionality

  
Kind/Security

This is security issue

  
Kind/Testing

Issue or pull request related to testing

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

No labels
Breaking Change
Kind/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
eric
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: Olive/getch#4
No description provided.
Delete branch "2.x"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?