From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sat, 04 Apr 2015 17:23:02 +0200 Organization: Probably a good idea Message-ID: <86vbhb9auh.fsf@dod.no> References: <871tk6538w.fsf@gnu.org> <838ueezgyk.fsf@gnu.org> <878ueejnjz.fsf@uwakimon.sk.tsukuba.ac.jp> <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <551A59F1.3060602@math.ntnu.no> <86384lciin.fsf@dod.no> <83bnj7syd5.fsf@gnu.org> <87y4mbhnw1.fsf@gmail.com> <83wq1vrgbk.fsf@gnu.org> <87sicjggj6.fsf@gmail.com> <83ego2r2vc.fsf@gnu.org> <86bnj59rjj.fsf@dod.no> <83wq1snd0k.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1428160997 17981 80.91.229.3 (4 Apr 2015 15:23:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 15:23:17 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 04 17:23:09 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YePud-0006Nv-PG for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 17:23:07 +0200 Original-Received: from localhost ([::1]:33427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YePuc-0008CV-7U for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 11:23:06 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YePuR-0008CF-3Z for emacs-devel@gnu.org; Sat, 04 Apr 2015 11:22:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YePuN-00040g-QP for emacs-devel@gnu.org; Sat, 04 Apr 2015 11:22:55 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:50860) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YePuN-00040Z-Jf for emacs-devel@gnu.org; Sat, 04 Apr 2015 11:22:51 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YePuK-0006CE-8K for emacs-devel@gnu.org; Sat, 04 Apr 2015 17:22:48 +0200 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 04 Apr 2015 17:22:48 +0200 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 04 Apr 2015 17:22:48 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 13 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:ye1Urgw6uJvbtSvYFUDkD/z4n2A= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:184871 Archived-At: >>>>> Eli Zaretskii : > The same you did with CVS: just pull. In most cases, this should > "just work". It might fail if there are conflicts with stuff you pull > from upstream, in which case you should resolve the conflicts (like > you did with CVS). Note that git will refuse to pull if there are uncommitted changes in any of the files touched by the pull. So in the minimal CVS-like workflow either one need to extend that workflow to use stash in some cases, or one need to keep committing files/changesets until the pull is able to succeed.