Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59193 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 94848 invoked from network); 28 Mar 2012 01:02:40 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 28 Mar 2012 01:02:40 -0000 Authentication-Results: pb1.pair.com smtp.mail=yohgaki@gmail.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=yohgaki@gmail.com; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.213.42 as permitted sender) X-PHP-List-Original-Sender: yohgaki@gmail.com X-Host-Fingerprint: 209.85.213.42 mail-yw0-f42.google.com Received: from [209.85.213.42] ([209.85.213.42:54746] helo=mail-yw0-f42.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 3E/C2-13163-E23627F4 for ; Tue, 27 Mar 2012 20:02:39 -0500 Received: by yhfq11 with SMTP id q11so479472yhf.29 for ; Tue, 27 Mar 2012 18:02:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type; bh=pB5N8jgd6HIqY/NvL2NAiTfFCEvwWUXedayQYdQ0tsw=; b=OpqFeGOaPaaxkJV72SM0xgVw5QC8nyBkf4D4GTg4O2m0X41yaLLPWOAiV0EcxWVspD ujtsP/n1Uoqd/eHnSCGnRom+R9PRjdl0Bj4xaTjYA2dbw236+zJQW4M/6BIWTjg0O4lP sPLmSf6tjtNgu6BLiC/JvkIv9Dgdj4sjeaddPP6YH4YkpPDs1gqZO7NMEXlpIuDeflIf +cn8bfPBJFhYWy01BHEiOgG2BhgU2brSxj6fGUB7B1xGobuq9WTmjRwt936YVCg7mqiS j7AahbvHhUtTLvCcthtaLDZIRRCX9iq2w4joF0PGE9n3I6gxKT8y58eiUW3lRBDejggl /NXQ== Received: by 10.101.130.20 with SMTP id h20mr8751397ann.58.1332896556681; Tue, 27 Mar 2012 18:02:36 -0700 (PDT) MIME-Version: 1.0 Sender: yohgaki@gmail.com Received: by 10.101.112.19 with HTTP; Tue, 27 Mar 2012 18:01:56 -0700 (PDT) In-Reply-To: <4F725ECF.7060702@sugarcrm.com> References: <4F725C51.1020207@sugarcrm.com> <4F725ECF.7060702@sugarcrm.com> Date: Wed, 28 Mar 2012 10:01:56 +0900 X-Google-Sender-Auth: BKoZqLeUFnSgV5N7X6Frz18JB1M Message-ID: To: Stas Malyshev Cc: Pierre Joye , PHP internals Content-Type: text/plain; charset=ISO-8859-1 Subject: Re: [PHP-DEV] git merge and generated files? From: yohgaki@ohgaki.net (Yasuo Ohgaki) Hi, 2012/3/28 Stas Malyshev : > Hi! > >>> Why would these change every 2nd commit? These only should change when >>> you change the scanner, which happens very rarely. >> >> It depends what you do, but still annoying when it happens. >> >> But that does not answer the question... > > Looking at the patch, it looks like yours and git's line endings did not > match, which may have caused the conflict. I think it'd be also the best > to resolve such conflicts by leaving the files as-is, maybe just by > using git reset or using git mergetool and choosing the "old" variant. > Depending on the system mergetool would use different tools so I'm not > sure which one would be best on yours. I usually just use mergetool, > mark every change to resolve to "old" variant and that cleans up the > commit. Besides the line ending problem, it's annoying when we're working on single work dir. All developers should have required build tools. How about remove generated C files from repository? These files are only needed for released versions, I suppose. We still compare generated C files against released versions and this would be sufficient for most developers. Regards, -- Yasuo Ohgaki yohgaki@ohgaki.net