Status: Closed (View Workflow)
Fix Version/s: None
We need to merge Language (po) files, however all out pull request are always in conflict as the TXID (language po files) are always edited at end of file.
New values are comma separated and using the UNION attribute does not work as the merge does not add the comma.
We have written our own merge driver for these files but can not configure Bibucket Server to use this driver when calculating conflicts in the pull request.
need to add something like this to the config file to work
name = A custom merge driver
driver = ./myDir1/myMerge.py %O %A %B %L
recursive = binary
In other words need to be able to use something this (https://www.npmjs.com/package/git-po-merge) for merge and pull requests for PO files
NOTE: This is more significant as we are using a Branch per Ticket model