From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sergey Organov Newsgroups: gmane.emacs.devel Subject: Re: Git transition workflow Date: Wed, 13 Aug 2014 18:16:22 +0400 Message-ID: References: <2720487.3bKIskrhp0@descartes> <87sil214zs.fsf@drakenvlieg.flower> <87lhqtv7vf.fsf@Rainer.invalid> <87iolxhwep.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1407939428 32377 80.91.229.3 (13 Aug 2014 14:17:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 13 Aug 2014 14:17:08 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 13 16:17:01 2014 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 1XHZMJ-000431-KA for ged-emacs-devel@m.gmane.org; Wed, 13 Aug 2014 16:16:59 +0200 Original-Received: from localhost ([::1]:47825 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHZMJ-0002ov-5T for ged-emacs-devel@m.gmane.org; Wed, 13 Aug 2014 10:16:59 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHZMB-0002nX-Un for emacs-devel@gnu.org; Wed, 13 Aug 2014 10:16:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHZM4-0005Mf-3U for emacs-devel@gnu.org; Wed, 13 Aug 2014 10:16:51 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:39369) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHZM3-0005MI-SX for emacs-devel@gnu.org; Wed, 13 Aug 2014 10:16:44 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XHZM2-0003uZ-Eo for emacs-devel@gnu.org; Wed, 13 Aug 2014 16:16:42 +0200 Original-Received: from 89.175.180.246 ([89.175.180.246]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 13 Aug 2014 16:16:42 +0200 Original-Received: from sorganov by 89.175.180.246 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 13 Aug 2014 16:16:42 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 26 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 89.175.180.246 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) 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:173624 Archived-At: Stefan Monnier writes: >> 3. Merge conflicts, if any, as well as their resolution, are very >> similar in both workflows. The only difference is that one needs to >> learn to use "git rebase --continue" instead of "git commit" after >> conflicts are resolved. > > There's one big difference here: in the merge case, all the state is > directly visible in the files, Not exactly, as staging area does have some hidden state. That's why you need to "git add" a file after you resolve conflicts (unlike CVS). > whereas for rebase, some of the state is stashed away in the .git > directory (hence the need to use "git rebase --continue" which fetches > the leftover state and keeps on processing it). > > It definitely takes some getting used it. Yes, indeed, it's unnatural to use "git rebase --continue" to continue interrupted "git pull". But fundamentally rebase is just a sequence of 1 or more merges ( = the number of commits to rebase, so still exactly 1 merge for typical quick fix). Nothing very new. -- Sergey.