No description provided.
Minor adjustments and refactoring #10
Open
WofWca
wants to merge 4 commits from
adjustments into master
pull from: adjustments
merge into: webxdc:master
webxdc:master
webxdc:r10s/style
webxdc:html-imporvements
WofWca
commented 2023年02月20日 15:44:34 +01:00
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 adjustments:adjustments
git switch adjustments
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 adjustments
git switch adjustments
git rebase master
git switch master
git merge --ff-only adjustments
git switch adjustments
git rebase master
git switch master
git merge --no-ff adjustments
git switch master
git merge --squash adjustments
git switch master
git merge --ff-only adjustments
git switch master
git merge adjustments
git push origin master
Sign in to join this conversation.
No reviewers
Labels
Clear labels
bug
Something isn't working
documentation
Improvements or additions to documentation
duplicate
This issue or pull request already exists
enhancement
New feature or request
good first issue
Good for newcomers
help wanted
Extra attention is needed
invalid
This doesn't seem right
question
Further information is requested
wontfix
This will not be worked on
No labels
bug
documentation
duplicate
enhancement
good first issue
help wanted
invalid
question
wontfix
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!10
Loading...
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "adjustments"
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?