There are some option that can be set in tortoiseHG to make the process a little easier, and I will update this tutorial at a later date. This will focus on the process of creating a pull request. The result is reflected in the commit log. We can change the commit message if wanted, and click commit.Ī final summary appears, we can click finish. This takes us back to the merge summary, and we can now click next. When you have resolved all conflicts, click close. If there are other conflicts in the file, you can select the down arrow ( 2) which will show you the next conflict in the file.Īfter all conflicts have been resolved, you might be greeted with this. This will automatically open the Meld diff tool.įrom the changes menu ( 1), you can push and pull changes as needed. Select a file to resolve, and select Diff to other. This moves the files to the Resolved conflicts panel, and we can resolve each file. With all files selected, lets click Tool Resolve. Here we have a summary of the conflicting files. There are some conflicts between the branch we are merging (5D3.123) and the local repository. * Enabling the option to automatically resolve merge conflicts seems to fix some weird conflict messages. * Or as a1ex points out below, you can select the loupe which opens the filter toolbar. Right click on the commit and select Merge with Local.Scroll * through the commit log and find the first entry for the branch.For this tutorial, I'll be working with the 5D3.123 branch. Lets merge some of the other branches with our local repo. The changes are reflected in the commit log. Instead, the new branch will be created as you commit your changes. This way your commit log doesn't contain a commit solely just for a new branch. Note: You can edit files before creating a branch.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |