Lediver.se
/
fediverse-blocklist-deploy
2
0
Fork 0
Code Issues 3 Pull Requests 1 Projects Releases Wiki Activity

Improve merges a bit - is not yet working correctly (see issues) #16

Open
moanos wants to merge 4 commits from merge-fix into main
pull from: merge-fix
merge into: Lediver.se:main
Conversation 0 Commits 4 Files Changed 2
moanos commented 2023-07-26 13:28:40 +02:00
Collaborator
There is no content yet.
moanos added 4 commits 2023-07-26 13:28:41 +02:00
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details
5340e18c22 Add showdiff
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
This pull request cannot be merged automatically due to conflicts.
Merge manually to resolve the conflicts.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b merge-fix main
git pull origin merge-fix

Step 2:

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff merge-fix
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
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: Lediver.se/fediverse-blocklist-deploy#16
There is no content yet.
Delete Branch "merge-fix"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?