moritz/auto_push_test
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity

Merge conflicts: Sync from Nextcloud (14.08.2024 15:45:35) #10

Open
moritz wants to merge 1 commit from nextcloud-sync-20240814153037 into main
pull from: nextcloud-sync-20240814153037
merge into: moritz:main
Conversation 0 Commits 1 Files changed 1 +1 -1
moritz commented 2024-08-14 15:45:35 +00:00
Owner
Copy link

Automatic sync from Nextcloud detected conflicts.

Automatic sync from Nextcloud detected conflicts.
moritz self-assigned this 2024-08-14 15:45:35 +00:00
moritz added 1 commit 2024-08-14 15:45:35 +00:00
This pull request has changes conflicting with the target branch.
  • README.md
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin nextcloud-sync-20240814153037:nextcloud-sync-20240814153037
git checkout nextcloud-sync-20240814153037

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff nextcloud-sync-20240814153037
git checkout main
git merge --ff-only nextcloud-sync-20240814153037
git checkout nextcloud-sync-20240814153037
git rebase main
git checkout main
git merge --no-ff nextcloud-sync-20240814153037
git checkout main
git merge --squash nextcloud-sync-20240814153037
git checkout main
git merge --ff-only nextcloud-sync-20240814153037
git checkout main
git merge nextcloud-sync-20240814153037
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
moritz
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: moritz/auto_push_test#10
No description provided.
Delete branch "nextcloud-sync-20240814153037"

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?