--- Paolo Ciarrocchi <paolo.ciarrocchi@xxxxxxxxx> wrote:
>
> So in this case, there is a difference between doing my local
> development under master or myownlocalbranch. Right?
> I mean, if I do my own development under master and I pull, the master
> branch will include origin and my local changes. Corret?
> While if I work in my local branch the datas are not modified with a
> pull, because pull will update only the local copy of the remote
> branch. Correct?
Following GIT's working flow isn't that much different than
other SCM's workflow.
Leave master and origin branches alone. Imagine they are your
local copy of that imaginary "root" repo.
If you want to do development, create your own branch off of
master at some point, say HEAD, using git-branch, call it my-branch.
Then do your development in my-branch, occasionally pulling from
master, all the while you update master on a regular basis
from the remote repo. That pull into my-branch would schedule
the merge for you and if it cannot auto-merge, it will leave it
up to you do _resolve_ and then commit. Eventually
you get into the habit of following the same commands in the
same steps.
Note the key words here: pull, merge, commit. Pull and merge is
is done by git-pull, and if there's things to resolve you do that
manually, in most simplistic ways.
If you're coming from another SCM, picking up git is a snap.
I think the only "hurdle" coming from another SCM especially
centralized is the decentralized nature of git.
Reading git-fetch, git-pull documentation very carefully
should clear things up.
Luben
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html