1
0
Fork
You've already forked dotfiles
0

Update README.md #1

Open
jacqueline wants to merge 1 commit from jacqueline-patch-1 into main
pull from: jacqueline-patch-1
merge into: jacqueline:main
jacqueline:main
jacqueline:mac
No description provided.
This pull request has changes conflicting with the target branch.
  • README.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 jacqueline-patch-1:jacqueline-patch-1
git switch jacqueline-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 jacqueline-patch-1
git switch jacqueline-patch-1
git rebase main
git switch main
git merge --ff-only jacqueline-patch-1
git switch jacqueline-patch-1
git rebase main
git switch main
git merge --no-ff jacqueline-patch-1
git switch main
git merge --squash jacqueline-patch-1
git switch main
git merge --ff-only jacqueline-patch-1
git switch main
git merge jacqueline-patch-1
git push origin main
Sign in to join this conversation.
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
jacqueline/dotfiles!1
Reference in a new issue
jacqueline/dotfiles
No description provided.
Delete branch "jacqueline-patch-1"

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?