Re: VC mode and git

[Eli Zaretskii]

> From: Steinar Bang <address@hidden>
> Date: Fri, 03 Apr 2015 11:22:36 +0200
> 
> >>>>> Eli Zaretskii <address@hidden>:
> 
> > So why would Richard need to use "stash" in this situation?  It sounds
> > like an unnecessary complication.
> 
> No, you're right.  Keep it simple, no stash or rebase in the examples.
> 
> To commit:
>  git commit
>  git push
> 
> If push fails:
>  git pull
>  git push
> 
> If pull fails with conflicts, fix the conflict markers like in CVS, then
>  git commit
>  git push

Thanks.