lix-project/lix-website
3
1
Fork 12
Code Issues 2 Pull requests 3 Packages Projects Releases Wiki Activity

Remove trailing whitespace #14

Open
rbt wants to merge 1 commit from trailing-space into main
pull from: trailing-space
merge into: lix-project:main
Conversation 1 Commits 1 Files changed 12 +86 -86
rbt commented 2024-05-06 16:19:38 +00:00
Owner
Copy link
No description provided.
rbt added 1 commit 2024-05-06 16:19:44 +00:00
rbt force-pushed trailing-space from f40d133f03 to 69ec60125b 2024-05-06 16:20:46 +00:00 Compare
irenes requested review from irenes 2024-06-12 19:52:36 +00:00
irenes commented 2024-06-12 19:52:49 +00:00
Owner
Copy link

good. yes. trailing whitespace bothers me beyond reason. please merge this.

good. yes. trailing whitespace bothers me beyond reason. please merge this.
This pull request has changes conflicting with the target branch.
  • content/about.md
  • content/add-to-config.md
  • content/install.md
View command line instructions.

Checkout

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

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff trailing-space
git checkout main
git merge --ff-only trailing-space
git checkout trailing-space
git rebase main
git checkout main
git merge --no-ff trailing-space
git checkout main
git merge --squash trailing-space
git checkout main
git merge --ff-only trailing-space
git checkout main
git merge trailing-space
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
irenes
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
2 participants
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: lix-project/lix-website#14
No description provided.
Delete branch "trailing-space"

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?