![]() For doing very complicated merges from branches which have a lot of collisions I mostly work with TortoiseGit and their merge tool. For pulling back branches in the main developement version I usually use the Bitbucket pull requests. So far, depending on the situation, I use different diff and merge tools. The main repository is placed on a Bitbucket server, together with JIRA. I'm doing the Git stuff with TortoiseGit. I'm working with a project with C source code in MPLAB X and a Git repository on Windows. I'm looking for recommendations for a good (3-way-)merge/diff tool, which can handle moved code in a much better way. ![]() ![]() Looking for a merge/diff tool which can handle moved code sections ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |