ForgeFlux/f3-rs
2
1
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity

WIP: catchup with F3 schema v1.0 #1

Draft
realaravinth wants to merge 3 commits from catchup into master
pull from: catchup
merge into: ForgeFlux:master
Conversation 0 Commits 3 Files changed 15 +1490 -40
realaravinth commented 2023-10-24 19:52:30 +05:30
Owner
Copy link
No description provided.
realaravinth self-assigned this 2023-10-24 19:52:30 +05:30
realaravinth added 3 commits 2023-10-24 19:52:30 +05:30
fix: CI only publish on master
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/pr/woodpecker Pipeline was successful
Details
d6aaac3f4a
realaravinth changed title from catchup with F3 schema v1.0 to WIP: catchup with F3 schema v1.0 2023-10-24 20:13:55 +05:30
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/pr/woodpecker Pipeline was successful
Details
This pull request has changes conflicting with the target branch.
  • .woodpecker.yml
  • Cargo.lock
View command line instructions

Checkout

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

Merge

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

   
renovate-security

   
security
No labels
renovate-bot
renovate-security
security
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
realaravinth
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: ForgeFlux/f3-rs#1
No description provided.
Delete branch "catchup"

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?