nm17/philosophy_logseq
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

WIP: Конспект по средним векам #1

Draft
nm17 wants to merge 1 commit from dev/middle-ages into master
pull from: dev/middle-ages
merge into: nm17:master
Conversation 0 Commits 1 Files changed 28 +993 -8
nm17 commented 2023-11-21 15:44:10 +03:00
Owner
Copy link
No description provided.
nm17 added 1 commit 2023-11-21 15:44:10 +03:00
nm17 changed title from WIP: Начало конспекта по средним векам to WIP: Конспект по средним векам 2023-11-21 15:44:25 +03:00
This pull request is marked as a work in progress.
View command line instructions

Checkout

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

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 master
git merge --no-ff dev/middle-ages
git checkout dev/middle-ages
git rebase master
git checkout master
git merge --ff-only dev/middle-ages
git checkout dev/middle-ages
git rebase master
git checkout master
git merge --no-ff dev/middle-ages
git checkout master
git merge --squash dev/middle-ages
git checkout master
git merge --ff-only dev/middle-ages
git checkout master
git merge dev/middle-ages
git push origin master
Sign in to join this conversation.
Reviewers
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: nm17/philosophy_logseq#1
No description provided.
Delete branch "dev/middle-ages"

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?