CODEWITHSUNDEEP
gitmergegit-mergegitkrakenthree-way-merge
Petr Přikryl
Petr Přikryl

Reputation: 1812

Custom merge driver not working in GitKraken

I am trying to use merge-po driver https://github.com/mezis/git-whistles#merge-po for smart merging gettext generated translation *.po files.

Driver works just fine in CLI (merged without conflicts) but GitKraken completely ignores custom merge driver settings (tried both local and global) and generates unnecessary conflicts. Is there any way how to use custom merge drivers directly in GitKraken?

~/.gitconfig

[push]
    followTags = true
[core]
    attributesfile = ~/.gitattributes
[merge "pofile"]
    name = custom merge driver for gettext po files
    driver = git merge-po %O %A %B

~/.gitattributes

*.po merge=pofile
*.pot merge=pofile

Upvotes: 0

Views: 347

Answers (0)

Related Questions