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: merging emacs-24 (was: bug#19074: Bug in auth-source.el's search of OS X Keychain) Date: Wed, 26 Nov 2014 13:59:33 -0500 Message-ID: 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 1417028413 31467 80.91.229.3 (26 Nov 2014 19:00:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 26 Nov 2014 19:00:13 +0000 (UTC) Cc: emacs-devel@gnu.org To: Ted Zlatanov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 26 20:00:06 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 1Xthoq-00084u-9O for ged-emacs-devel@m.gmane.org; Wed, 26 Nov 2014 20:00:04 +0100 Original-Received: from localhost ([::1]:35597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xthop-00085y-MS for ged-emacs-devel@m.gmane.org; Wed, 26 Nov 2014 14:00:03 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XthoW-00085r-JJ for emacs-devel@gnu.org; Wed, 26 Nov 2014 13:59:52 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XthoO-00045w-Td for emacs-devel@gnu.org; Wed, 26 Nov 2014 13:59:44 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:44841) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XthoO-00045o-Pa for emacs-devel@gnu.org; Wed, 26 Nov 2014 13:59:36 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id sAQIxYnO024857; Wed, 26 Nov 2014 13:59:34 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id E41FB4820; Wed, 26 Nov 2014 13:59:33 -0500 (EST) In-Reply-To: <87wq6hap7v.fsf@lifelogs.com> (Ted Zlatanov's message of "Wed, 26 Nov 2014 11:41:56 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5137=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5137> : inlines <1564> : streams <1349086> : uri <1836245> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.22 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:178313 Archived-At: > 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). Stefan