|
Looking at my last commit, I'm not so sure if keeping source code and translations in the same place is the best idea. I'm sure there is a way out using git branches, but it seems like I'm too stupid to actually use them correctly.
I admit I'm a total noob at git, and just don't get what effects "git checkout", "git branch" etc have, especially concerning how it relates to keeping local and remote versions synchronized over parallel branches.
I repeatedly got errors while trying to commit on "master" which said something about fast-forward, and I figured I needed to "git checkout js-tool; git pull; git checkout master" to get it working again. While this worked, I still don't know WHY it worked.
Can someone make this clearer, or is there a "git for idiots" page somewhere?
|