Elizhium/polycule
1
0
Fork 7
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undo merge conflict resolution #35

Merged
Elizhium merged 1 commits from amedee/polycule:fix-merge-conflict into main 2025-02-11 06:31:15 +01:00
Conversation 0 Commits 1 Files Changed 1 -6
amedee commented 2025-02-10 19:41:52 +01:00
Contributor
Copy Link

Removed connections were re-added in 46a1126c and 434fb586.
This commit removes them again.

Removed connections were re-added in 46a1126c and 434fb586. This commit removes them again.
amedee added 1 commit 2025-02-10 19:41:52 +01:00
Undo merge conflict resolution
All checks were successful
Render diagram / render (pull_request) Successful in 25s
Details
db67bc7512 
Removed connections were re-added in 46a1126c and 434fb586.
This commit removes them again.
Elizhium merged commit 171b9d0f47 into main 2025-02-11 06:31:15 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Elizhium
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Elizhium/polycule#35
Delete Branch "amedee/polycule:fix-merge-conflict"

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?