From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Incorrect merge Date: Fri, 05 Nov 2010 10:30:26 +0100 Message-ID: References: <4CCEC526.3070502@cornell.edu> <87aaltc9rc.fsf@stupidchicken.com> <83pqup53qb.fsf@gnu.org> <83fwvk6arf.fsf@gnu.org> <87hbg0jxyu.fsf@uwakimon.sk.tsukuba.ac.jp> <87d3qnk9am.fsf@telefonica.net> <87k4kvwu6w.fsf@uwakimon.sk.tsukuba.ac.jp> <8762wfk5r0.fsf@telefonica.net> <87eib3wp4j.fsf@uwakimon.sk.tsukuba.ac.jp> <87fwvjimg2.fsf@telefonica.net> <87d3qnwk0v.fsf@uwakimon.sk.tsukuba.ac.jp> <87wrovh2vl.fsf@telefonica.net> <871v73c775.fsf@uwakimon.sk.tsukuba.ac.jp> <87oca6hpld.fsf@telefonica.net> <87zktqj1fw.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1288949511 6727 80.91.229.12 (5 Nov 2010 09:31:51 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 5 Nov 2010 09:31:51 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 05 10:31:47 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PEIdR-0001g5-Su for ged-emacs-devel@m.gmane.org; Fri, 05 Nov 2010 10:31:29 +0100 Original-Received: from localhost ([127.0.0.1]:60887 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PEIdN-0001RD-HV for ged-emacs-devel@m.gmane.org; Fri, 05 Nov 2010 05:30:57 -0400 Original-Received: from [140.186.70.92] (port=36486 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PEIdC-0001R3-TJ for emacs-devel@gnu.org; Fri, 05 Nov 2010 05:30:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PEIcz-0005Ew-CC for emacs-devel@gnu.org; Fri, 05 Nov 2010 05:30:46 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.10]:42097) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PEIcz-0005EA-5F for emacs-devel@gnu.org; Fri, 05 Nov 2010 05:30:33 -0400 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id CD5C11C00474 for ; Fri, 5 Nov 2010 10:30:26 +0100 (CET) Original-Received: from hase (ppp-93-104-137-87.dynamic.mnet-online.de [93.104.137.87]) by mail.mnet-online.de (Postfix) with ESMTP id 841F01C00293 for ; Fri, 5 Nov 2010 10:30:26 +0100 (CET) X-Yow: YOU!! Give me the CUTEST, PINKEST, most charming little VICTORIAN DOLLHOUSE you can find!! An make it SNAPPY!! In-Reply-To: (Lars Magne Ingebrigtsen's message of "Thu, 04 Nov 2010 21:16:50 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:132394 Archived-At: Lars Magne Ingebrigtsen writes: > 1) They're a pain in the ass, both to write and due to the constant > merge conflicts. git-merge-changelog can help a lot here. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."