issues
search
sageserpent-open
/
kineticMerge
Merge a heavily refactored codebase and stay sane.
MIT License
12
stars
2
forks
source link
issues
Newest
Newest
Most commented
Recently updated
Oldest
Least commented
Least recently updated
Support merging of files added in subdirectories that do not yet exist in our branch.
#17
sageserpent-open
closed
1 year ago
1
Fix broken IntelliJ builds.
#16
sageserpent-open
closed
1 year ago
1
Release packaged executable.
#15
sageserpent-open
closed
1 year ago
12
Support `--no-commit` and `--no-ff`.
#14
sageserpent-open
closed
1 year ago
7
Clean Merging (including code motion inside files)
#13
sageserpent-open
closed
8 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
closed
4 months ago
12
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
1 year 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
6 months ago
1
Graceful handover of conflicts
#2
sageserpent-open
closed
9 months ago
1
Clean Merging (No code motion)
#1
sageserpent-open
closed
1 year ago
15
Previous