Sublime merge clond repository code#
Sublime merge clond repository download#

I wanted to glue to repositories together and have them look as though they had always been one repository all along. This is generally not a problem for the “import an external library” scenario but I was trying to do something different. you can view the commits in the DAG) but if you try to view the history for a specific file in your sub-project all you’ll get is one commit for that file – the subtree merge. You can see the history of commits for those files in aggregate (i.e.

Sublime merge clond repository code#

One side effect of this is that when you import the source code using a subtree merge all of the files show up as newly added files. For instance, do a web search on this subject and you’ll get a lot of information about git submodules or subtree merges, both of which are kind of complex and are designed for the situation where you’re trying to bring in source code from an external project or library and you want to bring in more changes from that project in the future, or ship your changes back to them. The bad news is that there are a few different ways to do it and some of them end up with a less desirable result (at least for our purposes) than others. Since a repository in Git is just a directed acyclic graph, it’s trivial to glue two graphs together and make one big graph. The good news is that Git makes this sort of thing very easy to do. However, we wanted to preserve all of the change history from each repo and have it available in the new repository. Over time we realized that there was no good reason for this arrangement and was just a general hassle and source of friction, so we decided to combine our two repositories into one repository containing both halves of the code base, with each of the old repositories in its own subdirectory. TypeScript 3.A while ago my team had code for our project spread out in two different Git repositories.

Sublime merge clond repository download#

You can download and read more about the Git Client from the Sublime Merge website. Now they have invited other users to try it as well. Sublime Merge is in its early stages and has only been used by the makers and a small team of beta testers. For business licenses, subscription is available. Individual licences are lifetime with three years of updates included.

However, Git itself, is directly used in Sublime Merge for repository mutating operations like staging, committing, checking out branches, etc. It uses a custom implementation of Git for reading repositories that drives high performance functionalities.

Sublime Merge uses the same lingo as Git, and it doesn’t make use of any state beyond Git itself. Hovering over the buttons will show you which command it will run. Working with Sublime Merge means you’re working with the real Git, and not just a simplified version. Complex search queries can also be constructed using ‘and’, ‘or’, and ‘()’ symbols for deep searches within folders. You can search for commit messages, commit authors, file names, and even wildcard patterns. Sublime Merge features find-as-you-type search to find the commit with exact matches. The smerge tool that comes with Sublime Merge can be used to open repositories, blame files, and search for commits. So either the GUI or the command line can be used for different functions, the choice is yours. All repository changes are updated live and things work the same from the command line as they would from the UI. Sublime Merge will work hand-in-hand with the command line. The Command Palette allows quick access to a large set of Git commands and is triggered by Ctrl+P.

Space bar can toggle expansion, and Enter can stage/unstage hunks. The Tab key can be used to navigate through different parts of the application. There are also good keyboard usability options. It can be done simply by selecting any two commits in Sublime Merge with Ctrl+Left Mouse to show the diff between them. This includes renames, moves, resolving conflicts or just looking at the commit history. For cases where necessary, Sublime Merge will display exactly which individual characters have been changed for a commit.