andras/reconcile
1
0
Fork 0
Code Issues Pull requests 5 Projects Releases Packages Wiki Activity Actions

Refactor & simplify merging logic #3

Merged
schmelczer merged 15 commits from asch/simplify into main 2025-06-22 15:07:04 +01:00
Conversation 0 Commits 15 Files changed 16 +481 -698
schmelczer commented 2025-06-22 14:55:15 +01:00 (Migrated from github.com)
Copy link
  • Remove new-text indexes and instead use old text indexes and accumulator values
  • Remove MergeContext and accounting around how long old operations' effects last
  • Add tests
  • Improve cursor moving logic
- Remove new-text indexes and instead use old text indexes and accumulator values - Remove MergeContext and accounting around how long old operations' effects last - Add tests - Improve cursor moving logic
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something isn't working

  
dependencies

Pull requests that update a dependency file

  
documentation

Improvements or additions to documentation

  
duplicate

This issue or pull request already exists

  
enhancement

New feature or request

  
github_actions

Pull requests that update GitHub Actions code

  
good first issue

Good for newcomers

  
help wanted

Extra attention is needed

  
invalid

This doesn't seem right

  
question

Further information is requested

  
rust

Pull requests that update rust code

  
wontfix

This will not be worked on

No labels
bug
dependencies
documentation
duplicate
enhancement
github_actions
good first issue
help wanted
invalid
question
rust
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
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: andras/reconcile#3
No description provided.
Delete branch "asch/simplify"

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?