Skip to content

Commit

Permalink
add links to git submodule articles
Browse files Browse the repository at this point in the history
  • Loading branch information
cbrake committed Apr 6, 2020
1 parent 2254637 commit b82c82f
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions docs/git-submodules.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
[up](README.md)

Git submodules are used in this project to manage the various OE layers for
reasons described in [this document](superproject-management.md). There are a
few issues that are commonly encountered.
reasons described in [this document](superproject-management.md). See this
[article](https://www.atlassian.com/git/tutorials/git-submodule) for an
introduction to Git submodules.

There are a few issues that are commonly encountered decsribed below.

## Modifying Submodules

Expand All @@ -15,7 +18,9 @@ forget to do this, you may get an error when pushing and then if you run
`git branch`, you'll discover you are on the _(no branch)_ branch. To recover
from this situation, check out the branch you want to work on and then run
`git reflog`. This command will list recent commits which you can then
cherry-pick to your working branch.
cherry-pick to your working branch. See this
[article](http://bec-systems.com/site/696/git-submodules-what-to-do-when-you-commit-to-no-branch)
for more information.

## Submodule merge conflicts

Expand Down

0 comments on commit b82c82f

Please sign in to comment.