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

Use em dashes when appropriate #15

Open
rbt wants to merge 1 commit from em-dash into main
pull from: em-dash
merge into: lix-project:main
Conversation 1 Commits 1 Files changed 7 +36 -36
rbt commented 2024-05-06 16:48:04 +00:00
Owner
Copy link

Lots of en dashes are being used to join clauses or insert asides. Em dashes are correct here.

Lots of en dashes are being used to join clauses or insert asides. Em dashes are correct here.
👍 1
rbt added 1 commit 2024-05-06 16:48:09 +00:00
rbt force-pushed em-dash from faf1b759fa to ed8781699a 2024-05-06 16:49:06 +00:00 Compare
irenes requested review from irenes 2024-06-12 19:49:22 +00:00
irenes commented 2024-06-12 19:49:35 +00:00
Owner
Copy link

yes absolutely, sounds great, go ahead and merge it (fix that conflict of course)

yes absolutely, sounds great, go ahead and merge it (fix that conflict of course)
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 em-dash:em-dash
git checkout em-dash

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff em-dash
git checkout main
git merge --ff-only em-dash
git checkout em-dash
git rebase main
git checkout main
git merge --no-ff em-dash
git checkout main
git merge --squash em-dash
git checkout main
git merge --ff-only em-dash
git checkout main
git merge em-dash
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#15
No description provided.
Delete branch "em-dash"

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?