Hacker GitHub

← All repos

Praqma/git-merge-driver

View on GitHub ↗ ★ 114 Shell

Example of how to configure a custom git merge driver

4 mentions on Hacker News by 3 people: 0 stories, 4 comments · first 2018-07-30 · latest 2024-02-11

Mentions per year 4 mentions · busiest year 2018 (1)
20082026
AllStoriesComments NewestTopOldest
  1. …will show text changes. Further, there's git-merge-driver for merging various file formats ( https://github.com/Praqma/git-merge-driver ).
    comment by nomonnai · 2024-02-11 · in 'Obviously ChatGPT' – how reviewers accused me of scientific fraud
  2. …to put together something basic. One complication with using a custom merge driver, as discussed by https://github.com/Praqma/git-merge-driver , is that they need to be configured inside the `.git/config` of the repo, which itself is not…
    comment by shoo · 2021-09-28 · in What if Git worked with programming languages?
  3. …Simple example of the plumbing to wire in a merge driver, with a trivial dumb driver script: https://github.com/Praqma/git-merge-driver
    comment by shoo · 2020-03-27 · in How different are different diff algorithms in Git?
  4. In git, you could do this with a custom merge driver: https://github.com/Praqma/git-merge-driver No need to put that sort of thing in core.
    comment by Ajedi32 · 2018-07-30 · in Elastic TabStops: A Better Way to Indent and Align Code (2017)