I am using Git with visual studio2017 and i currently need to merge external changes in a somewhat weird manner. I\'m not sure how to go about this.
The story goes as fol
