From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Git transition workflow Date: Wed, 13 Aug 2014 08:52:41 -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 X-Trace: ger.gmane.org 1407934387 30926 80.91.229.3 (13 Aug 2014 12:53:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 13 Aug 2014 12:53:07 +0000 (UTC) Cc: emacs-devel@gnu.org To: Sergey Organov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 13 14:53:00 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 1XHY32-0005F7-0G for ged-emacs-devel@m.gmane.org; Wed, 13 Aug 2014 14:53:00 +0200 Original-Received: from localhost ([::1]:47268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHY31-0007h0-Kk for ged-emacs-devel@m.gmane.org; Wed, 13 Aug 2014 08:52:59 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHY2s-0007gc-34 for emacs-devel@gnu.org; Wed, 13 Aug 2014 08:52:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHY2k-00009B-K3 for emacs-devel@gnu.org; Wed, 13 Aug 2014 08:52:50 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:22991) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHY2k-000096-GE for emacs-devel@gnu.org; Wed, 13 Aug 2014 08:52:42 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArUGAIDvNVPAqyKr/2dsb2JhbABZgwaDSsA9gRcXdIIlAQEBAQIBViMFCwsOJhIUGA0kiAQI0hkXjnoHhDgEqwODTCE X-IPAS-Result: ArUGAIDvNVPAqyKr/2dsb2JhbABZgwaDSsA9gRcXdIIlAQEBAQIBViMFCwsOJhIUGA0kiAQI0hkXjnoHhDgEqwODTCE X-IronPort-AV: E=Sophos;i="4.97,753,1389762000"; d="scan'208";a="86630568" Original-Received: from 192-171-34-171.cpe.pppoe.ca (HELO pastel.home) ([192.171.34.171]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 13 Aug 2014 08:52:41 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 9F3F36056D; Wed, 13 Aug 2014 08:52:41 -0400 (EDT) In-Reply-To: (Sergey Organov's message of "Wed, 13 Aug 2014 14:30:04 +0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:173620 Archived-At: > 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, 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. Stefan