1
0
Fork
You've already forked personal
0

Add NS guide #22

Open
etienne wants to merge 1 commit from nova-scotia into master
pull from: nova-scotia
merge into: etienne:master
etienne:master
etienne:xmpp-post
etienne:nouvelle-ecosse
etienne:ardour-bbcso
etienne:dark-light-mode
etienne:develop
etienne:remove-js
etienne:orchestration
etienne:recipes
No description provided.
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 nova-scotia:nova-scotia
git switch nova-scotia

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 switch master
git merge --no-ff nova-scotia
git switch nova-scotia
git rebase master
git switch master
git merge --ff-only nova-scotia
git switch nova-scotia
git rebase master
git switch master
git merge --no-ff nova-scotia
git switch master
git merge --squash nova-scotia
git switch master
git merge --ff-only nova-scotia
git switch master
git merge nova-scotia
git push origin master
Sign in to join this conversation.
No reviewers
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
etienne/personal!22
Reference in a new issue
etienne/personal
No description provided.
Delete branch "nova-scotia"

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?