Microsoft interview question

Design a code merging tool