SergeychWorks/mp_diff
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Не сохраняется порядок разрешения конфликта при объединении результата #2

New Issue
Closed
opened 2023-09-16 19:07:01 +03:00 by anzhu · 0 comments
anzhu commented 2023-09-16 19:07:01 +03:00
Collaborator
Copy Link

src/commonTest/kotlin/testMerge.kt Line 149 in 6a67a4e840
fun testMergeConflictOrder() {

https://gitea.sergeych.net/SergeychWorks/mp_diff/src/commit/6a67a4e840a0c91ff8beaffbca85555751f137aa/src/commonTest/kotlin/testMerge.kt#L149
sergeych referenced this issue from a commit 2024-03-20 02:08:27 +03:00
v0.0.10
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
  
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
important

Mskr it first priority

  
invalid

Something is wrong

  
low

   
question

More information is needed

  
wontfix

This won't be fixed

No Label
bug
duplicate
enhancement
help wanted
important
invalid
low
question
wontfix
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: SergeychWorks/mp_diff#2
No description provided.
Delete Branch "%!s()"

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?