Uploaded image for project: 'Bitbucket Server'
  1. Bitbucket Server
  2. BSERV-9348

Allow the use of Custom merge driver for merge and pull requests

    XMLWordPrintable

    Details

    • Type: Suggestion
    • Status: Closed (View Workflow)
    • Resolution: Duplicate
    • Fix Version/s: None
    • Component/s: None
    • Labels:
      None
    • Feedback Policy:
      We collect Bitbucket feedback from various sources, and we evaluate what we've collected when planning our product roadmap. To understand how this piece of feedback will be reviewed, see our Implementation of New Features Policy.

      Description

      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

      [merge "myMerge"]
      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 

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              Unassigned Unassigned
              Reporter:
              urai1338635299 Urai
              Votes:
              0 Vote for this issue
              Watchers:
              5 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved: