[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: VC mode and git

From: Steinar Bang
Subject: Re: VC mode and git
Date: Fri, 03 Apr 2015 11:22:36 +0200
User-agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt)

>>>>> 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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]