Symphony.

So, I am going through some unsuccessful hoops while trying to update to 2.1.1 using Git.

The Beginning

1. Cloned the old repo from github.com/pointybeard git clone <url> [destination dir]
2. Installed submodules git submodule init git submodule update
3. Created ‘mybranch’ and checked out to it.
4. Added other extensions git submodule add <repo> [extensions/extensionName]
5. Worked on it, did some changes, including an .htaccess custom redirect.
6. Now I want to update to the latest… what do I do?

To recap: I am working on a branch other than master, I added non-official extensions while working in my branch, did some changes to the default .htaccess.

The Present

Now should I:

1. switch back to branch master
2. run git fetch && git pull
3. ??? totally confused…

Also, it appears that some debudevkit is writing to its own folder and Git sees this, adding one more layer of not-knowing-how-to-handle-it. See status message

# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#   (commit or discard the untracked or modified content in submodules)
#
#   modified:   extensions/debugdevkit (untracked content)
#   modified:   extensions/selectbox_link_field (modified content)
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#   extensions/content_type_mappings/
#   extensions/order_entries/
#   extensions/paypal_payments/
#   extensions/thumbnail/
no changes added to commit (use "git add" and/or "git commit -a")