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: Wed, 01 Apr 2015 17:43:46 +0200 Organization: Probably a good idea Message-ID: <86a8yrc0r1.fsf@dod.no> References: <86egoeusg2.fsf@example.com> <87384qzxqy.fsf@igel.home> <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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427903085 24767 80.91.229.3 (1 Apr 2015 15:44:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 15:44:45 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 01 17:44:39 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 1YdKol-0004mq-NS for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 17:44:35 +0200 Original-Received: from localhost ([::1]:53470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdKol-0001WD-5H for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 11:44:35 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdKoB-0001Ry-Vs for emacs-devel@gnu.org; Wed, 01 Apr 2015 11:44:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdKo6-0001Pa-RU for emacs-devel@gnu.org; Wed, 01 Apr 2015 11:43:59 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:34020) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdKo6-0001PQ-Kk for emacs-devel@gnu.org; Wed, 01 Apr 2015 11:43:54 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YdKo4-0004ES-28 for emacs-devel@gnu.org; Wed, 01 Apr 2015 17:43:52 +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 ; Wed, 01 Apr 2015 17:43:52 +0200 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 01 Apr 2015 17:43:52 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 44 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:Ckexok3mRNlSKYvXgIDqUw5yZtk= 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:184731 Archived-At: >>>>> Richard Stallman : >> Dangerous in which way? > I don't know. The git documentation says it can cause some sort of > lossage, but was not specific. As Eli said in a different message: disregard this as hypothetical. >> If you get a conflict in the merge, git will not complete the commit >> until the conflict is handled (much as any version control system). > 1. Is that what happened to me? I've sent the output of several > diagnostic commands; perhaps you can tell from them. I haven't followed the diagnostics too closely, but I know that you had several unpushed commits, and your ChangeLog changes in one of these commits conflicted with savannah's version of the ChangeLog. What I'm not sure of is whether or not you also had uncommitted changes? Did you commit before you pulled? Or did you commit and then pull? > 2. With CVS, merge conflicts are easy to handle -- just edit the file, > look for the <<< and >>> that indicate conflicts, and fix up each one. > Can I do it that way in Git? As Eli says: yes 1. Edit the file, search for the conflict markers and fix them 2. git add name-of-conflicted-file ("git add ChangeLog" in your case) 3. git commit The commit will open an editor, asking you to complete/confirme the commit message (there will be a default message there indicating that this is a merge commit, and what files conflicted in the merge. I usually add stuff like "Manually resolved conflicted files" when I have fixed things, but you can just close the editor and let the default message stand). What editor git chooses, depends on your EDITOR environment variable (I use emacsclient).