TE
TechEcho
Home24h TopNewestBestAskShowJobs
GitHubTwitter
Home

TechEcho

A tech news platform built with Next.js, providing global tech news and discussions.

GitHubTwitter

Home

HomeNewestBestAskShowJobs

Resources

HackerNews APIOriginal HackerNewsNext.js

© 2025 TechEcho. All rights reserved.

Automatic Git conflict resolution on logs and sets

1 pointsby relyioover 7 years ago

1 comment

stephenrover 7 years ago
Isn't the same achieved just by using `somefile*.txt merge=union` in the .gitattributes file?