Lint tools to catch performance, usability, version compatibility and other problems. A rich layout editor that allows you to drag-and-drop UI components, preview layouts on multiple screen configurations, and much more. Template-based wizards to create common Android designs and components. Android-specific refactoring and quick fixes. ProGuard and app-signing capabilities. Download android studio for mac os. Visual Studio Code Git MergeIf you are using Visual Studio plugin for Git, but you have also configured Git with MSys git, probably you could be surprised by some Visual Studio behavior. The most obvious one is that commits are done using the wrong user.name and user.email configuration as I’ve described in other one can be: tools used to do merge and diff during conflicts. Suppose you are working with Visual Studio, you issue a pull and find that there is some conflicts in repository. Figure 1: Pull operation has a conflict Now you should resolve all conflicts before being able to continue work: you can click on file name that is conflicting and you are presented with a UI different from the one you are used with standard TFS Source control. Figure 2: Ui to manage conflicts when you are using Git in Visual Studio If you press “compare files” to visualize diff of files, it could happen that kdiff3 is opened to visualize the difference, instead of resolving directly inside Visual Studio. Figure 3: File compare is done with Kdiff3 instead of visualizing them inside Visual Studio This happens because Visual Studio Git Plugin uses standard git configuration, your local repository probably does not have any specific tools for diff and merge (unless you configured them), so global settings are honored. To verify actual settings you can open a Git Bash on the repository, issue a git config –list command and look at merge.tool and diff.tool settings Figure 4: Actual configuration for merge and diff tools Since I’ve configured kdiff3 as standard conflict resolution tool after I installed msysgit, Visual Studio honors this settings and opens kdiff3 to do the diff, even if I’m inside the IDE of VS.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |