earl-warren/end-to-end
2
1
Fork 0
Code Issues 3 Pull requests 13 Actions Packages Projects Releases Wiki Activity

cascading-pr from https://codeberg.org/forgejo/forgejo refs/pull/2872/head to forgejo/forgejo-2872 #138

Open
cascading-pr wants to merge 1 commit from cascading-pr/forgejo/forgejo-2872 into main
pull from: cascading-pr/forgejo/forgejo-2872
merge into: earl-warren:main
Conversation 0 Commits 1 Files changed 2 +2 -1
cascading-pr commented 2024-03-29 12:23:05 +00:00 (Migrated from code.forgejo.org)
Copy link

cascading-pr from https://codeberg.org/forgejo/forgejo refs/pull/2872/head

cascading-pr from https://codeberg.org/forgejo/forgejo refs/pull/2872/head
This pull request has changes conflicting with the target branch.
  • forgejo/sources/7.0
View command line instructions

Checkout

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

Merge

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

l1

  
l2
No labels
l1
l2
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: earl-warren/end-to-end#138
No description provided.
Delete branch "cascading-pr/forgejo/forgejo-2872"

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?