This dialog box is displayed in order to call attention for the conflict occurred when merging the branches. 21. Click the OK button. 22. The Message area of the “TortoiseGit“Commit dialog box automatically shows comments that conflicts occurred when merging the branches. If necessary, add or change comments in the Message area and click the Commit button. Sysmac Studio Project Version Control Function Startup Guide (P125) 91