Update content/homework/week-01-hw-principles-and-practices/_index.md #1

Open

2026a-rachel-rusk wants to merge 1 commit from 2026a-rachel-rusk-patch-1 into main

pull from: 2026a-rachel-rusk-patch-1

merge into: 2026a-rachel-rusk:main

2026a-rachel-rusk:main

Conversation 0 Commits 1 Files changed 1 +12 -11

2026a-rachel-rusk commented 2026-02-10 22:41:42 +00:00

Owner

Copy link

No description provided.

2026a-rachel-rusk added 1 commit 2026-02-10 22:41:42 +00:00

Update content/homework/week-01-hw-principles-and-practices/_index.md 1a6e956f19

This pull request has changes conflicting with the target branch.

• content/homework/week-01-hw-principles-and-practices/_index.md

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'Update content/homework/week-01-hw-principles-and-practices/_index.md' (#1) from 2026a-rachel-rusk-patch-1 into main

Merge commit body Reviewed-on: https://edit.htgaa.org/2026a-rachel-rusk/webpages/pulls/1

Merge pull request 'Update content/homework/week-01-hw-principles-and-practices/_index.md' (#1) from 2026a-rachel-rusk-patch-1 into main Reviewed-on: https://edit.htgaa.org/2026a-rachel-rusk/webpages/pulls/1 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 2026a-rachel-rusk-patch-1:2026a-rachel-rusk-patch-1

git switch 2026a-rachel-rusk-patch-1

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 2026a-rachel-rusk-patch-1

git switch 2026a-rachel-rusk-patch-1

git rebase main

git switch main

git merge --ff-only 2026a-rachel-rusk-patch-1

git switch 2026a-rachel-rusk-patch-1

git rebase main

git switch main

git merge --no-ff 2026a-rachel-rusk-patch-1

git switch main

git merge --squash 2026a-rachel-rusk-patch-1

git switch main

git merge --ff-only 2026a-rachel-rusk-patch-1

git switch main

git merge 2026a-rachel-rusk-patch-1

git push origin main

Sign in to join this conversation.

Reviewers

No reviewers

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

1 participant

Notifications

Subscribe

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

2026a-rachel-rusk/webpages!1

No description provided.