|
|
|
|
|
by trashb
62 days ago
|
|
> It also doesn't work for anything that's not a text file. You can define a custom git merge driver to teach git how to handle your proprietary format. Edit: after a quick google search I found the following curated list, https://github.com/jelmer/awesome-merge-drivers |
|