mam/mamweb
11
0
Fork 0
Code Issues Pull requests 10 Projects Wiki Activity Actions

WIP: Přednášky #87

Draft
zelvuska wants to merge 13 commits from prednasky into master
pull from: prednasky
merge into: mam:master
Conversation 0 Commits 13 Files changed 12 +421 -213
zelvuska commented 2025-01-24 20:38:37 +01:00
Owner
Copy link

Trochu update aplikace přednášek + přidání Tomových požadavků.

Trochu update aplikace přednášek + přidání Tomových požadavků.
zelvuska added 10 commits 2025-01-24 20:38:37 +01:00
zelvuska added 1 commit 2025-01-24 20:42:56 +01:00
zelvuska added 1 commit 2025-01-24 21:03:52 +01:00
zelvuska added 1 commit 2025-01-24 21:07:31 +01:00
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions

Checkout

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

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 prednasky
git checkout prednasky
git rebase master
git checkout master
git merge --ff-only prednasky
git checkout prednasky
git rebase master
git checkout master
git merge --no-ff prednasky
git checkout master
git merge --squash prednasky
git checkout master
git merge --ff-only prednasky
git checkout master
git merge prednasky
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: mam/mamweb#87
No description provided.
Delete branch "prednasky"

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?