Add script to help resolve git merge conflicts in dict.json i18n file

[seancolsen]

@pavish heads up about this little tool I spun up today.

Even though we're sorting the keys in dict.json, I've still noticed that resolving merge conflicts in that file is a bit annoying. I threw together this script which helps out by doing a three-way merge on a per-key basis. It worked for me when I had to resolve merge conflicts today. It still needs some polish before I'd want to merge it in. I'd want to change the hard-coded paths to use a positional command line argument instead. This way we could run it on other dict.json files too.

If you think this would be useful, I can finish it.

Or if you have another idea for how to easy resolve these sort of merge conflicts, I'd be keen to hear it.

Checklist

• My pull request has a descriptive title (not a vague title like Update index.md).
• My pull request targets the develop branch of the repository
• My commit messages follow best practices.
• My code follows the established code style of the repository.
• I added tests for the changes I made (if applicable).
• I added or updated documentation (if applicable).
• I tried running the project locally and verified that there are no visible errors.

Developer Certificate of Origin

Developer Certificate of Origin

Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.