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

moritz:main

moritz:nextcloud-sync-20240814142724

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

Sync from Nextcloud on 2024-08-14 15:30:37 52c1b18057

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.

Merge commit title Merge pull request 'Merge conflicts: Sync from Nextcloud (14.08.2024 15:45:35)' (#10) from nextcloud-sync-20240814153037 into main

Merge commit body Reviewed-on: https://git.schienengruen.de/moritz/auto_push_test/pulls/10

Merge pull request 'Merge conflicts: Sync from Nextcloud (14.08.2024 15:45:35)' (#10) from nextcloud-sync-20240814153037 into main Reviewed-on: https://git.schienengruen.de/moritz/auto_push_test/pulls/10 Copy merge commit message

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 switch nextcloud-sync-20240814153037

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 nextcloud-sync-20240814153037

git switch nextcloud-sync-20240814153037

git rebase main

git switch main

git merge --ff-only nextcloud-sync-20240814153037

git switch nextcloud-sync-20240814153037

git rebase main

git switch main

git merge --no-ff nextcloud-sync-20240814153037

git switch main

git merge --squash nextcloud-sync-20240814153037

git switch main

git merge --ff-only nextcloud-sync-20240814153037

git switch 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

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

moritz/auto_push_test!10

No description provided.