WIP: Draft: linear.144: add feet #38

Draft
avernois wants to merge 1 commit from linear_144_feet into main
avernois commented 2020-07-21 18:45:50 +00:00 (Migrated from gitlab.com)

Add optional feet for the clock.

Add optional feet for the clock.
avernois commented 2020-07-31 15:08:23 +00:00 (Migrated from gitlab.com)

marked as a Work In Progress

marked as a **Work In Progress**
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 linear_144_feet:linear_144_feet
git switch linear_144_feet

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 main
git merge --no-ff linear_144_feet
git switch linear_144_feet
git rebase main
git switch main
git merge --ff-only linear_144_feet
git switch linear_144_feet
git rebase main
git switch main
git merge --no-ff linear_144_feet
git switch main
git merge --squash linear_144_feet
git switch main
git merge --ff-only linear_144_feet
git switch main
git merge linear_144_feet
git push origin main
Sign in to join this conversation.
No reviewers
No milestone
No project
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
avernois/clocks!38
No description provided.