TE
TechEcho
Home
24h Top
Newest
Best
Ask
Show
Jobs
English
GitHub
Twitter
Home
Automatic Git conflict resolution on logs and sets
1 points
by
relyio
over 7 years ago
1 comment
stephenr
over 7 years ago
Isn't the same achieved just by using `somefile*.txt merge=union` in the .gitattributes file?