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: Fri, 03 Apr 2015 17:10:08 +0200 Organization: Probably a good idea Message-ID: <86bnj59rjj.fsf@dod.no> References: <83bnjen71r.fsf@gnu.org> <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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1428073822 16309 80.91.229.3 (3 Apr 2015 15:10:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2015 15:10:22 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 03 17:10:13 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 1Ye3Ea-0005j9-QT for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 17:10:12 +0200 Original-Received: from localhost ([::1]:34428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ye3Ea-0000ZQ-2K for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 11:10:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ye3EN-0000ZL-21 for emacs-devel@gnu.org; Fri, 03 Apr 2015 11:10:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ye3EJ-0005gX-2W for emacs-devel@gnu.org; Fri, 03 Apr 2015 11:09:58 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:50362) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ye3EI-0005eq-S5 for emacs-devel@gnu.org; Fri, 03 Apr 2015 11:09:54 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Ye3EH-0005ZW-Qq for emacs-devel@gnu.org; Fri, 03 Apr 2015 17:09:53 +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 ; Fri, 03 Apr 2015 17:09:53 +0200 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 03 Apr 2015 17:09:53 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 24 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:3dpbOrJBoMR2O+rUwg+0E49lJ9w= 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:184840 Archived-At: >>>>> Richard Stallman : > I always commit an entire changeset -- that's why I use vc-dir -- but > the changeset is often not all of the files I have edited. Over a few > weeks I may have fixed a few bugs in different files. I commit the > different fixes separately. > vc-dir is good for that. If this is your work pattern, you should commit all of your changesets before attempting a push. Ie. git push Then if git fails because someone else have pushed since your last push, do git pull git push If "git pull" gets conflicts, resolve the conflicts like with CVS, then git commit git push