Under the cat you will also find examples of Git settings for use with DiffMerge and WinMerge under Windows. In order to fill the lack of information on the site, I decided to write this mini-review. In this regard, the question arose of revising the arsenal of tools, in particular the question of choosing a tool for visual comparison and merging (diff and merge). Recently, I “jumped” from mercurial (which I still think is more convenient and logical) to git, because the vast majority of projects that interest me use git and are hosted on github. But there was almost no information about the tools for visual comparison and resolution of merge conflicts. There were also discussions about plugins for IDE for working with git and mercurial. This is how VS Code looks for a commit message.On Habré, there have already been many articles on distributed version control systems ( DVCS ), their comparisons, as well as comparisons of GUI clients for them. This is how Nano looks for a commit message.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |