dln/dotfiles
0
0
Code Issues Pull requests1 Activity

Set up Sway #1

Open
dln wants to merge 1 commit from dln/push-uukkorqwopqy into main
Conversation 0 Commits 1 Files changed 4 +113 -4
dln commented 2024-10-23 20:19:37 +02:00
Owner
No description provided.
dln added 1 commit 2024-10-23 20:19:37 +02:00
dln force-pushed dln/push-uukkorqwopqy from 2393e83d59 to 5f7046eafa 2024-10-23 20:38:06 +02:00 Compare
dln force-pushed dln/push-uukkorqwopqy from 5f7046eafa to 906a806b5d 2024-10-23 20:39:27 +02:00 Compare
This pull request has changes conflicting with the target branch.
  • flake.lock
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin dln/push-uukkorqwopqy:dln/push-uukkorqwopqy
git checkout dln/push-uukkorqwopqy

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 checkout main
git merge --no-ff dln/push-uukkorqwopqy
git checkout dln/push-uukkorqwopqy
git rebase main
git checkout main
git merge --ff-only dln/push-uukkorqwopqy
git checkout dln/push-uukkorqwopqy
git rebase main
git checkout main
git merge --no-ff dln/push-uukkorqwopqy
git checkout main
git merge --squash dln/push-uukkorqwopqy
git checkout main
git merge --ff-only dln/push-uukkorqwopqy
git checkout main
git merge dln/push-uukkorqwopqy
git push origin main
Sign in to join this conversation.
No reviewers
No labels
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: dln/dotfiles#1
No description provided.
Delete branch "dln/push-uukkorqwopqy"

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?