From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: git pull fails with merge conflicts. How can this possibly happen? Date: Sat, 15 Nov 2014 12:15:50 +0100 Message-ID: <87ioigyas9.fsf@engster.org> References: <20141114183737.GB3168@acm.acm> <5466517B.50705@porkrind.org> <20141114215404.GD3168@acm.acm> <838ujchods.fsf@gnu.org> <8761egx1k2.fsf@uwakimon.sk.tsukuba.ac.jp> <83sihkg2ds.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416050179 8959 80.91.229.3 (15 Nov 2014 11:16:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 11:16:19 +0000 (UTC) Cc: acm@muc.de, "Stephen J. Turnbull" , emacs-devel@gnu.org, yuri.v.khan@gmail.com, david@porkrind.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 12:16:14 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 1XpbKu-0002r5-UT for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 12:16:13 +0100 Original-Received: from localhost ([::1]:39852 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpbKu-0008Nb-GI for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 06:16:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40724) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpbKn-0008NV-A2 for emacs-devel@gnu.org; Sat, 15 Nov 2014 06:16:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpbKi-0004tk-7k for emacs-devel@gnu.org; Sat, 15 Nov 2014 06:16:05 -0500 Original-Received: from randomsample.de ([5.45.97.173]:33531) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpbKh-0004tg-Uu; Sat, 15 Nov 2014 06:16:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=m9U+BssB13SwuGHespLCxkF3veeZXPHzS3piRQry+p8=; b=KKKM/UMAqkyNCTKagKaDfaRa9Dy+PoNGAJBtp9hVgYBFj7zXffzPZiIo6mF7oqt3vKah+6x44zsoqUF/mRfdzE7TeGGfwJ72VaPkVI3dnacgSlz8y7RpPuCye0NLCECf; Original-Received: from ip2504b377.dynamic.kabel-deutschland.de ([37.4.179.119] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XpbKd-0005DY-Up; Sat, 15 Nov 2014 12:15:56 +0100 In-Reply-To: <83sihkg2ds.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 15 Nov 2014 12:54:39 +0200") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) Mail-Followup-To: Eli Zaretskii , "Stephen J. Turnbull" , acm@muc.de, david@porkrind.org, emacs-devel@gnu.org, yuri.v.khan@gmail.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:177164 Archived-At: Eli Zaretskii writes: > At times, I have a distinct feeling that Someone(TM) made a conscious > effort to confuse me by picking up a different semantics. That's because Git was designed as a "stupid content tracker". The in this thread often mentioned "Git Pro" book says it right up front: "Git thinks of its data more like a set of snapshots of a miniature filesystem" [1]. You really have to fully embrace that notion to get comfortable with Git (to a certain degree...). >> [1] Granted, submodules *are* hard; it's not just that tree is >> generalized to array of tree-or-blob-or-commit, but that commits also >> change semantics when used in submodules. But we're not talking about >> submodules in Emacs yet. > > I think we are, in the ELPA related discussions. But maybe I'm > confused about that, too. Submodules would be an option if each package we want to bundle with Emacs was in its own repository. However, since they are all in elpa.git, I don't think it makes much sense to import it as a submodule, especially since this introduces a lot of additional complexity into the workflow. -David [1] http://git-scm.com/book/en/v2/Getting-Started-Git-Basics