[Kmymoney-devel] GIT workflow query

[Alvaro Soliverez]

You only pull from the remote while on master or in a branch that's
present in the remote. For your own branches, you rebase from master
(or stable, etc.)

So, the workflow would be like this:


git checkout featureX
(code, test, whatever)
git checkout master
git pull -r
git checkout featureX
git rebase master
(solve conflicts, if any)


Regards,
Alvaro

On Sun, Nov 27, 2011 at 9:13 AM, Marko Käning <mk-lists at email.de> wrote:
> Hi Alvaro,
>
> now that we are at it, I also have a question.
>
> What concerns DVCSs I am familiar with Mercurial, but not git.
>
> I ran into a similar situation like Allan, after having created my own branch yesterday I noticed that master proceeded. I could update my clone to master's new tip by issuing
> ---
> $ git checkout master
> $ git pull
> ---
>
> Now I can go to my branch
> ---
> $ git checkout BRANCH-online_statement_balance_highlighting
> Switched to branch 'BRANCH-online_statement_balance_highlighting'
> $
> ---
>
> There I still don't see the progress which master made in the meantime.
> I figure that I need to pull the latest changesets into my branch, so that I could rebase my changes on top of the current master head/tip, if possible.
>
> Well, but when I try to do that like this
> ---
> $ git pull -r
> You asked me to pull without telling me which branch you
> want to rebase against, and 'branch.BRANCH-online_statement_balance_highlighting.merge' in
> your configuration file does not tell me, either. Please
> specify which branch you want to use on the command line and
> try again (e.g. 'git pull <repository> <refspec>').
> See git-pull(1) for details.
>
> If you often rebase against the same branch, you may want to
> use something like the following in your configuration file:
>    [branch "BRANCH-online_statement_balance_highlighting"]
>    remote = <nickname>
>    merge = <remote-ref>
>    rebase = true
>
>    [remote "<nickname>"]
>    url = <url>
>    fetch = <refspec>
>
> See git-config(1) for details.
> ---
> well, yes, you see the above. I feel fairly lost. :-( Looks like I need to play with git for a while to get used to it. I mean, you see it in my terminology, I'm surviving okay with Mercurial these days, but I am a complete n00b with git.
>
> I figure, however, that I need to tell git that it should rebase against master, right? I thought it would know that itself…
>
> Looks like I have to work with my branch - for now - and ignore the progress the code made on master while hoping that someone can give me a hint what the correct workflow would be.
> (I admit that I haven't been studying any git howto or so, up to now.)
>
> Greets,
> Marko
> _______________________________________________
> KMyMoney-devel mailing list
> KMyMoney-devel at kde.org
> https://mail.kde.org/mailman/listinfo/kmymoney-devel
>