webxdc/poll
17
2
Fork
You've already forked poll
2

Html imporvements #11

Open
WofWca wants to merge 7 commits from html-imporvements into master
pull from: html-imporvements
merge into: webxdc:master
webxdc:master
webxdc:r10s/style
webxdc:adjustments

Based on #10

Based on #10
This pull request has changes conflicting with the target branch.
  • index.html
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

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

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 html-imporvements
git switch html-imporvements
git rebase master
git switch master
git merge --ff-only html-imporvements
git switch html-imporvements
git rebase master
git switch master
git merge --no-ff html-imporvements
git switch master
git merge --squash html-imporvements
git switch master
git merge --ff-only html-imporvements
git switch master
git merge html-imporvements
git push origin master
Sign in to join this conversation.
No reviewers
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
webxdc/poll!11
Reference in a new issue
webxdc/poll
No description provided.
Delete branch "html-imporvements"

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?