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: merging emacs-24 Date: Wed, 26 Nov 2014 20:02:22 +0100 Message-ID: <87k32hrdj5.fsf@engster.org> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417028588 1981 80.91.229.3 (26 Nov 2014 19:03:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 26 Nov 2014 19:03:08 +0000 (UTC) Cc: Ted Zlatanov , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 26 20:03:02 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 1Xthri-0001zO-D3 for ged-emacs-devel@m.gmane.org; Wed, 26 Nov 2014 20:03:02 +0100 Original-Received: from localhost ([::1]:35620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xthri-0002Dz-03 for ged-emacs-devel@m.gmane.org; Wed, 26 Nov 2014 14:03:02 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38663) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XthrO-0002DN-Ob for emacs-devel@gnu.org; Wed, 26 Nov 2014 14:02:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XthrJ-0005J4-A9 for emacs-devel@gnu.org; Wed, 26 Nov 2014 14:02:42 -0500 Original-Received: from randomsample.de ([5.45.97.173]:54774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XthrJ-0005Ha-1S for emacs-devel@gnu.org; Wed, 26 Nov 2014 14:02:37 -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=x3/U++nab39EfMq9WGu8y+oxJdns+K59sUFUzFZIZcw=; b=rf0aGzYUzX7s1XgR8zxcbSJL3HWcdU0EKAHiQv63ArpM2IilIKT3UEs2663EXQCceLLEpuOKoypE50GEABEI54FzeluzvIgJLtsudRGKdAZHNaigceVceD++PZUwus4E; Original-Received: from ip4d154d80.dynamic.kabel-deutschland.de ([77.21.77.128] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XthrA-0000vT-Nz; Wed, 26 Nov 2014 20:02:28 +0100 In-Reply-To: (Stefan Monnier's message of "Wed, 26 Nov 2014 13:59:33 -0500") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) 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:178315 Archived-At: Stefan Monnier writes: >> Is it enough to merge laconically like you did: > [...] >> ...and resolve conflicts as needed? > > Yes. Be careful with the conflicts, tho: some of those patches should > simply not be applied (regardless if they'd create conflicts or not). > > You might prefer to wait for the gitmerge.el to appear (I thought it > was supposed to be done already, but I guess it's taking a bit more > time than expected). Seems like you overlooked this: http://article.gmane.org/gmane.emacs.devel/178096 -David