1. eaacc4f project: add merge union git strategy by Thibault Wittemberg ยท 7 years ago