Commit cabc3bb3 authored by Arnaud Blanchard's avatar Arnaud Blanchard

Doc about removing submodules

parent bb75a4c1
......@@ -11,12 +11,24 @@ Note that git pull merge from he repository branch
Conflicts:
----------
You can use **meld** to have a graphical interface to select the differences.
You want to get only their modifications: `git checkout --theirs <files>`
You can use **meld** to have a graphical interface to select the differences.
You want to get only yours modifications: ` git checkout --ours <files>`
- You want to get only their modifications: `git checkout --theirs <files>`
- You want to get only yours modifications: ` git checkout --ours <files>`
Then `git add <files>`to say you fix the conflict.
Remove a specific commits: `git revert <commit id>`
Submodules
==========
Remove
------
1. git submodule deinit -f -- <submodule>
2. rm -rf .git/modules/<submodule>
3. git rm -f <submodule>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment