![]() $ git init mainĪfter whole code-base has been moved in, we can push it out to GitHub. We create repository for localization provider core/common module. netcore (.NET Core repository, has dependency on main).epi (repository for EPiServer integration, has dependency on main and aspnet).aspnet (repository for Asp.Net Mvc applications, has dependency on main module).main package repository (core/common functionality).You start with top-level module repo which does not have any external dependencies on any other module (core/common functionality). Now when you have decided module boundaries it's time to create repositories for each of the module. Create Repositories with Submodules Create Main Module Repo This gives nicer debugger experience for developer without any hustle to enable symbols and be able to "step into" the package source code. Decision has to be made around type locations - where each type should go and which project will be used where.Īctually for development purposes using ordinary project reference is much more preferred way to work with. ![]() It's important to understand where each module ends and where next begins as you be referencing each other through sort of NuGet package references. This is a blog post about the stuff I had to do. So decided to split whole code-base into git submodules and setup separate repositories for each of the sub-systems. abstract/core packages containing only general purpose functionality (like expression tree walker or resource definition attributes)Īs you can see there might be some issue with having multiple purpose packages (with different life-cycles and versions) located in single Git repository.Later realized that there is actually not so much to do to add support for Asp.Net Mvc (.NET Framework) applications and later also for. Initially there was just a EPiServer package to add support for database driven localization resources. Therefore, a commit of a superproject also contains the name of the submodule directories, along with the current commit of these submodules.During development of DbLocalizationProvider I had single repository in GitHub containing more that one package as result of the build. You want the version that actually works with your status of fiji. Most of the time you do not want to have the newest coolest version of the submodule. What is the difference between calling git supmodule update from the fiji directory and changing into a submodule directory and doing a git pull? This is probably the opposite way round from what you expect from resolving conflicts while merging :) Difference between git submodule update and git pull git diff -ours shows the differences between the “master” or “upstream” branch and the working tree.git diff -theirs shows the differences between the “server” branch and the working tree.If you’re using git diff -theirs and git diff -ours while rebasing then you may get confused. Now we should be able to continue, with git rebase -continue A note on “ours” and “theirs” The usual sequence of commands when working inside a submodule: See the Submodules section of the Downloading and Building Fiji From Source page for details. However, to work with a submodule you must clone that repository. Checking out submodulesĮach submodule is a proper full-fledged git repository, so any git commands executed within the folders of the submodule will affect that git repository, not fiji’s. that 40-digit hex string which is the unique identifier of each commit) of that submodule. Submodules, although existing as folders inside the fiji repository, are different: only the folder name, as a path pointer, is registered as belonging to fiji’s git repository, together with the current revision (“commit name”, i.e. With git, any git command executed within any subdirectory of the repository affects the overall git repository. Submodules in Fijiįiji is hosted on a main git repository which contains several declared submodules such as TrakEM2. When in doubt, ask for help from the community. This section is out of date, potentially misleading or invalid.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |