Re: VC mode and git

[Eli Zaretskii]

> Date: Tue, 31 Mar 2015 18:36:32 +0200
> From: Harald Hanche-Olsen <address@hidden>
> CC: address@hidden, address@hidden, address@hidden, address@hidden
> 
> Eli Zaretskii wrote:
> >> Date: Tue, 31 Mar 2015 17:34:41 +0200
> >> From: Harald Hanche-Olsen<address@hidden>
> >> Cc: address@hidden, Richard Stallman<address@hidden>, address@hidden
> >>
> >> But Richard just said that “checking in”‚ to him, means putting it in
> >> the central repository.
> >>
> >> A better phrasing is:  Commit, then pull.
> >
> > No, it's better for Richard to pull, then checkin.  That's closer to
> > what he is used to, and even if there's trouble (pull fails due to
> > uncommitted changes), that trouble is closer in spirit to what he
> > would have in a similar situation with CVS and bzr, so it would be
> > easier for him to understand the situation and fix it.
> 
> Okay, now you have me terminally confused.
> 
> What do you mean by checkin here?

The same as you: put in the upstream repository.  IOW, commit, then
push.

> To be more specific, my suggestion is
> 
>    git commit
>    git pull
>    deal with conflicts, if any, ending with another git commit
>    git push
> 
> Are you saying it is better for Richard to do git pull before git 
> commit, if he has uncommited changes?

Yes.