2026a-charles-naney/webpages
0
0
Fork 0
generated from htgaa/student-template-2026a
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

Update content/homework/week-04-hw-protein-design-part-i/_index.md #1

Open
2026a-charles-naney wants to merge 1 commit from 2026a-charles-naney-patch-2 into main
pull from: 2026a-charles-naney-patch-2
merge into: 2026a-charles-naney:main
Conversation 1 Commits 1 Files changed 1 +5 -1
2026a-charles-naney commented 2026-03-04 21:36:37 +00:00
Owner
Copy link
No description provided.
2026a-charles-naney commented 2026-03-04 21:37:22 +00:00
Author
Owner
Copy link

no idea what's going on with this pull and merge right now.

no idea what's going on with this pull and merge right now.
This pull request has changes conflicting with the target branch.
  • content/homework/week-04-hw-protein-design-part-i/_index.md
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 2026a-charles-naney-patch-2:2026a-charles-naney-patch-2
git switch 2026a-charles-naney-patch-2

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-charles-naney-patch-2
git switch 2026a-charles-naney-patch-2
git rebase main
git switch main
git merge --ff-only 2026a-charles-naney-patch-2
git switch 2026a-charles-naney-patch-2
git rebase main
git switch main
git merge --no-ff 2026a-charles-naney-patch-2
git switch main
git merge --squash 2026a-charles-naney-patch-2
git switch main
git merge --ff-only 2026a-charles-naney-patch-2
git switch main
git merge 2026a-charles-naney-patch-2
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
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-charles-naney/webpages!1
No description provided.