Git Merge activity by activity

[3-rimo (Rikke Mohn)]

Hello,

Are there any plans to allow for more detailed merging when using GIT as a version control tool?

Having to fully overwrite files with each merge ruins some of the advantages of using GIT rather than another version control tool.

Best Wishes,

Rikke Mohn