11/8/2023 0 Comments Github desktop resolve conflicts![]() Using a Merge ToolĪlthough you could, in theory, edit such a merged version in any text editor, I highly recommend using a dedicated merge tool for this job. In case you want to combine both versions, you need to compose this in a "Merge Tool". ![]() In case you selected just one of the original versions to be correct, you can simply click the "Resolve Using Their/My Version" button to move on. To do so, select both of the versions on the top.Īfter you've made your selection, the bottom container will have adjusted - along with the button below.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |