flipdot/Wiki
23
0
Fork 0
Code Issues Pull requests 1 Activity

Rename nas to datengrab #1

Open
0boro wants to merge 1 commit from fix-nas into main
pull from: fix-nas
merge into: flipdot:main
Conversation 0 Commits 1 Files changed 1 +6 -7
0boro commented 2024-01-07 19:29:51 +01:00
Owner
Copy link
No description provided.
0boro added 1 commit 2024-01-07 19:29:52 +01:00
0boro requested review from malled 2024-01-07 19:30:12 +01:00
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

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

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 checkout main
git merge --no-ff fix-nas
git checkout fix-nas
git rebase main
git checkout main
git merge --ff-only fix-nas
git checkout fix-nas
git rebase main
git checkout main
git merge --no-ff fix-nas
git checkout main
git merge --squash fix-nas
git checkout main
git merge --ff-only fix-nas
git checkout main
git merge fix-nas
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
malled
Labels
Clear labels
No items
No labels
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: flipdot/Wiki#1
No description provided.
Delete branch "fix-nas"

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?