How To Merge Files In Git