Examples of using Submodule directory in English and their translations into Dutch
{-}
-
Colloquial
-
Official
-
Ecclesiastic
-
Medicine
-
Financial
-
Computer
-
Ecclesiastic
-
Official/political
-
Programming
Now we have some changes in our submodule directory.
You can go into the submodule directory and fix the conflict just as you normally would.
First, you must be relatively careful when working in the submodule directory.
First of all, let's go into our submodule directory and check out a branch.
First, you must be relatively careful when working in the submodule directory.
You have to move the rack submodule directory out of the way before you can switch to a branch that doesn't have it.
This is the case because the pointer you have for the submodule isn't what is actually in the submodule directory.
You have to move the rack submodule directory out of the way before you can switch to a branch that doesn't have it.
you have the code in your submodule directory when you're done.
If we go into our submodule directory, it should already be on eb41d76 as the merge would not have touched it.
destroying a submodule directory won't lose any commits
You can go into the submodule directory and fix the conflict just as you normally would.
you still have the submodule directory as an untracked directory. .
So, we will go into our submodule directory, create a branch based on that second SHA-1 from git diff
you still have the submodule directory as an untracked directory. .
You can just as easily go into the submodule directory, see what the difference is,
it doesn't update the code in the submodule directory, so it looks like you have a dirty state in your working directory. .
not overwrite unsaved work in your submodule directory.
To avoid this issue, create a branch when you work in a submodule directory with git checkout-b work or something equivalent.
If you do an initial submodule update, commit in that submodule directory without creating a branch to work in,
in Git although other modes are used for directories and submodules.