oliverpool/test
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects 1 Releases Packages Wiki Activity

WIP: [BUG] lol #3

Draft
oliverpool wants to merge 2 commits from test into main
pull from: test
merge into: oliverpool:main
Conversation 0 Commits 2 Files changed 1 +1
oliverpool commented 2024-04-26 20:31:44 +00:00
Owner
Copy link

Description

No response

Screenshots

s

Forgejo Version

v

Can you reproduce the bug on Forgejo Next?

Yes

Browser Version

v

Operating System

No response

### Description _No response_ ### Screenshots s ### Forgejo Version v ### Can you reproduce the bug on Forgejo Next? Yes ### Browser Version v ### Operating System _No response_
oliverpool added 2 commits 2024-04-26 20:31:44 +00:00
oliverpool changed title from WIP: [BUG] to [BUG] 2024-04-26 20:31:48 +00:00
oliverpool changed title from [BUG] to WIP: [BUG] 2024-04-26 20:31:52 +00:00
oliverpool changed title from WIP: [BUG] to WIP: [BUG] lol 2024-04-26 20:36:08 +00:00
oliverpool changed title from WIP: [BUG] lol to [BUG] lol 2024-04-26 20:41:03 +00:00
oliverpool changed title from [BUG] lol to WIP: [BUG] lol 2024-04-26 20:41:06 +00:00
oliverpool changed title from WIP: [BUG] lol to [BUG] lol 2024-04-26 20:41:09 +00:00
oliverpool changed title from [BUG] lol to WIP: [BUG] lol 2024-04-26 20:41:11 +00:00
oliverpool added the
bug
 label 2024-04-29 09:43:52 +00:00
This pull request has changes conflicting with the target branch.
  • .build.yml
View command line instructions

Checkout

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

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff test
git checkout main
git merge --ff-only test
git checkout test
git rebase main
git checkout main
git merge --no-ff test
git checkout main
git merge --squash test
git checkout main
git merge --ff-only test
git checkout main
git merge test
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
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: oliverpool/test#3
No description provided.
Delete branch "test"

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?