issues
search
sageserpent-open
/
kineticMerge
Merge a heavily refactored codebase and stay sane.
MIT License
9
stars
1
forks
source link
issues
Newest
Newest
Most commented
Recently updated
Oldest
Least commented
Least recently updated
Support other Version Control Systems.
#45
sageserpent-open
opened
4 weeks ago
1
Design documentation.
#44
sageserpent-open
closed
3 weeks ago
2
Filling gaps with one-token sections makes for odd-looking merges.
#43
sageserpent-open
closed
1 month ago
4
Fix poor merge due to trailing shared context being treated as an extended insertion.
#42
sageserpent-open
closed
1 month ago
28
Adjust indentation when migrating edits or insertions.
#41
sageserpent-open
opened
1 month ago
1
`MatchError` faults Kinetic Merge when merging a file deleted on one side and modified on another.
#40
sageserpent-open
closed
1 month ago
5
Search for matches keeps hitting the same estimated window size prior to finding an optimal match.
#39
sageserpent-open
closed
1 month ago
33
Issue a diagnostic message when a diverging move is detected.
#38
sageserpent-open
closed
1 month ago
10
Bad Merge of Kinetic Merge Repository.
#37
sageserpent-open
closed
2 months ago
17
Show progress while running.
#36
sageserpent-open
closed
2 months ago
1
Further performance improvements.
#35
sageserpent-open
opened
2 months ago
2
Improve performance for inter-file code motion analysis.
#34
sageserpent-open
closed
2 months ago
26
How should a deletion versus modification conflict be handled?
#33
sageserpent-open
closed
1 month ago
1
Resolve divergent moves when one is intra-file and the other inter-file.
#32
sageserpent-open
opened
3 months ago
0
Deal with small ambiguous matches gracefully.
#31
sageserpent-open
opened
3 months ago
3
Insertion Anchoring
#30
sageserpent-open
closed
1 month ago
22
Edit anchoring.
#29
sageserpent-open
opened
3 months ago
2
Broaden support for edit and deletion propagation through moves.
#28
sageserpent-open
opened
3 months ago
1
When do merge conflicts end?
#27
sageserpent-open
closed
4 months ago
4
Clean Merging (including code motion across files)
#26
sageserpent-open
closed
2 months ago
17
Go faster!
#25
sageserpent-open
closed
4 months ago
8
Odd merges seen at higher match thresholds.
#24
sageserpent-open
closed
5 months ago
16
Orphaned text at bottom of the merge.
#23
sageserpent-open
closed
5 months ago
29
Mysterious quiet merge resolution.
#22
sageserpent-open
closed
5 months ago
7
Dogfood Testing.
#21
sageserpent-open
opened
5 months ago
8
Add configuration option for `minimumSizeFractionForMotionDetection`.
#20
sageserpent-open
closed
5 months ago
5
Weird merge results.
#19
sageserpent-open
closed
5 months ago
66
Files modified in a subdirectory of the Git repository in their branch can't be merged.
#18
sageserpent-open
closed
8 months ago
2
Support merging of files added in subdirectories that do not yet exist in our branch.
#17
sageserpent-open
closed
8 months ago
1
Fix broken IntelliJ builds.
#16
sageserpent-open
closed
8 months ago
1
Release packaged executable.
#15
sageserpent-open
closed
8 months ago
12
Support `--no-commit` and `--no-ff`.
#14
sageserpent-open
closed
9 months ago
7
Clean Merging (including code motion inside files)
#13
sageserpent-open
closed
3 months ago
25
How is Kinetic Merge packaged?
#12
sageserpent-open
closed
1 year ago
2
Support merging of file joins with conflicts.
#11
sageserpent-open
opened
1 year ago
1
Handle code orphans as divergences.
#10
sageserpent-open
opened
1 year ago
0
Question: how to automatically resolve whitespace differences where feasible?
#9
sageserpent-open
opened
1 year ago
5
Use the Git configuration variable for merge conflict style.
#8
sageserpent-open
opened
1 year ago
0
Ignore whitespace when merging.
#7
sageserpent-open
closed
8 months ago
2
User can resolve divergent code motion.
#6
sageserpent-open
opened
1 year ago
3
Question: how should code motion of a section of code on one branch versus deletion on another be handled?
#5
sageserpent-open
opened
1 year ago
9
Duplicate the behaviour of Git merge for simple renaming / movement of files with minor editing on one branch and outright deletion on the other.
#4
sageserpent-open
opened
1 year ago
0
Duplicate the behaviour of Git merge for simple renaming / movement of files with minor editing on either branch being merged.
#3
sageserpent-open
closed
1 month ago
1
Graceful handover of conflicts
#2
sageserpent-open
closed
4 months ago
1
Clean Merging (No code motion)
#1
sageserpent-open
closed
9 months ago
15