From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: Dynamic loading progress Date: Sun, 08 Nov 2015 13:54:00 +0100 Organization: Probably a good idea Message-ID: References: <871tc315y3.fsf@lifelogs.com> <83611eqk9w.fsf@gnu.org> <878u6ax7c7.fsf@lifelogs.com> <83k2ptq5t3.fsf@gnu.org> <87h9kxx60e.fsf@lifelogs.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1446987324 17987 80.91.229.3 (8 Nov 2015 12:55:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 8 Nov 2015 12:55:24 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 08 13:55:17 2015 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 1ZvPV4-0001r3-Nw for ged-emacs-devel@m.gmane.org; Sun, 08 Nov 2015 13:55:14 +0100 Original-Received: from localhost ([::1]:47169 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvPV4-0005oE-0T for ged-emacs-devel@m.gmane.org; Sun, 08 Nov 2015 07:55:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvPV0-0005mB-FP for emacs-devel@gnu.org; Sun, 08 Nov 2015 07:55:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZvPUw-0005AT-FX for emacs-devel@gnu.org; Sun, 08 Nov 2015 07:55:10 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:60623) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvPUw-00059R-9g for emacs-devel@gnu.org; Sun, 08 Nov 2015 07:55:06 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1ZvPUt-0001ei-MJ for emacs-devel@gnu.org; Sun, 08 Nov 2015 13:55:03 +0100 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 08 Nov 2015 13:55:03 +0100 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 08 Nov 2015 13:55:03 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 9 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:O2YCZ+oBRrcPOdreee+u6G7PhBw= 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:193605 Archived-At: >>>>> Philipp Stephani : > In order to produce a clean patch, I tried merging the master (from > emacs-mirror) or emacs-24 branch, but both produced too many merge > conflicts (even in files untouched by the module code). What kind of conflicts in what files? Could you provide some detail? What was the command line sequence you used to do the merges from master and emacs-24?