Either Commit the merge/rebase or use Discard to cancel the merge/rebase.ĭirectory is either the repository root or a submodule root, see Submodule Statesįile is under version control and neither modified in working tree nor in Index.įile is not under version control, but only exists in the working tree. Repository is in ‘merging’ or ‘rebasing’ state (only displayed on the root directory). Repository contains conflicting files (only displayed on the root directory). Use Stage to remove the files from the repository or Discard to restore them in the working tree. Use Stage to add the files to the repository.ĭirectory is not present in the repository (exists only in the working tree) and is marked as to be ignored.ĭirectory is present in the repository, but does not exist in the working tree. Directory States Iconĭirectory is present in the repository (more precisely: there is at least one versioned file below this directory stored in the repository).ĭirectory is present in the repository and there are local changes within this directory in the working tree.ĭirectory (and contained files) are present in the working tree, but have not been added to the repository yet. Light-yellow background indicates the name-filtering state. Unchanged files are hidden, they can be found by filtering by name - theįiles matching by name but not by state are shown in gray, while a The context menu allows to enable regularĮxpressions and save patterns for later usage or delete them. To filter by name, use the input field (or +-keystroke)Ībove the file table. Preferences (page Low-level Properties, option eBackgroundColor). Option for you, you can deactivate this coloring feature in the Your working, you should consider to mark them as ignored. If this annoys you because you permanently have untracked files in The background turns to light-red as a reminder to not forget about index-only changed or untracked) are hidden, The table as well as the menu items in the View menu. The state filters can be set using the small toolbar buttons above The Files view can be filtered by file state and To add existing or new local repositories to SmartGit, please take a The possible file states are listed in File States. Possible states of submodules in Submodule States. The primary directory states are listed in Primary Directory States, and The Files view displays the status of your working tree (and Repositories opened in this window, the directory structure (and their The Repositories view shows all repositories known to SmartGit and, for Your non-commercial license will work with these products out-of-the-box.Propose Changes Repositories, Directories and Files SmartSVN and SmartSynchronizeĮxcept of the hobby users we have applied the same licensing changes for SmartSVN 14.3 and SmartSynchronize 4.4. We have decided to take this step, because the current proportion of non-commercial users is above 60%.įor a B2B-product in the Software industry, this is in stark contrast with the overall number of Software developers compared to the number of primary open source developers and academic users □. The new licensing conditions are now enforced by requiring a non-commercial license. Technically enforced licensing conditions hobby users, with certain limitations on the repositories requires version 23.1 preview, see also this blog post.employees or students on public academic institutions (before, it was only “for learning or teaching on a public academic institution”).everyone who spends the majority of their work on open-source projects (before, it was only “to actively work on open-source projects”, which is significantly more restrictive).For SmartGit 22.1, we have changed the non-commercial licensing conditions to be more permissive overall.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |