I\'m looking for a way to use Git, or take recommendations on any Git clients that may have powerful merge tools to resolve an issue that can be summarised as:
