lukas/WANessa-CI-dev
2
0
Fork 0
forked from KomuSolutions/WANessa
Code Pull Requests 2 Actions Activity

Database #2

Open
lukas wants to merge 2 commits from Database into main
pull from: Database
merge into: lukas:main
Conversation 0 Commits 2 Files Changed 6 +627 -3
lukas commented 2024-02-15 18:03:36 +01:00
Owner
Copy Link
No description provided.
lukas added 2 commits 2024-02-15 18:03:37 +01:00
This pull request has changes conflicting with the target branch.
  • Cargo.toml
  • src/main.rs
View command line instructions.

Checkout

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

Merge

Merge the changes and update on Gitea.
git checkout main
git merge --no-ff Database
git checkout main
git merge --ff-only Database
git checkout Database
git rebase main
git checkout main
git merge --no-ff Database
git checkout main
git merge --squash Database
git checkout main
git merge --ff-only Database
git checkout main
git merge Database
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 Participants
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: lukas/WANessa-CI-dev#2
No description provided.
Delete Branch "Database"

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?