Okay, then I'll leave you to work it out.
Thank you, Marsha, for advice!
@wmtan01 here's the official answer from Support on this - I got it from your ticket:
I was told that these options will not be possible at this time. For now, the only option for updating the values in Git would be to resolve the conflicts as they come up.
View solution in original post