From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id CF6821F404 for ; Fri, 7 Sep 2018 00:12:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726738AbeIGEuJ (ORCPT ); Fri, 7 Sep 2018 00:50:09 -0400 Received: from fed1rmfepo102.cox.net ([68.230.241.144]:58403 "EHLO fed1rmfepo102.cox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726031AbeIGEuJ (ORCPT ); Fri, 7 Sep 2018 00:50:09 -0400 Received: from fed1rmimpo306.cox.net ([68.230.241.174]) by fed1rmfepo102.cox.net (InterMail vM.8.01.05.28 201-2260-151-171-20160122) with ESMTP id <20180907001209.HQVL4225.fed1rmfepo102.cox.net@fed1rmimpo306.cox.net> for ; Thu, 6 Sep 2018 20:12:09 -0400 Received: from thunderbird.smith.home ([68.2.114.239]) by fed1rmimpo306.cox.net with cox id YQC81y00V59yGBo01QC8lD; Thu, 06 Sep 2018 20:12:09 -0400 X-CT-Class: Clean X-CT-Score: 0.00 X-CT-RefID: str=0001.0A09020A.5B91C259.001E,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0 X-CT-Spam: 0 X-Authority-Analysis: v=2.2 cv=MJoQoIRl c=1 sm=1 tr=0 a=BlDZPKRk22kUaIvSBqmi8w==:117 a=BlDZPKRk22kUaIvSBqmi8w==:17 a=kj9zAlcOel0A:10 a=x7bEGLp0ZPQA:10 a=JBFolyDoGHsA:10 a=5rxgeBVgAAAA:8 a=kviXuzpPAAAA:8 a=0lQQHXy6qO6a2KQlgiUA:9 a=CjuIK1q_8ugA:10 a=V47CcFzRC8AA:10 a=u09W0hvIdLUA:10 a=PwKx63F5tFurRwaNxrlG:22 a=qrIFiuKZe2vaD64auk6j:22 X-CM-Score: 0.00 Authentication-Results: cox.net; auth=pass (LOGIN) smtp.auth=ischis2@cox.net Received: from thunderbird.localnet (localhost [127.0.0.1]) by thunderbird.smith.home (Postfix) with ESMTP id 72DF229A007E; Thu, 6 Sep 2018 17:12:08 -0700 (MST) From: Stephen Smith To: Junio C Hamano Cc: Git Mailing List Subject: Re: How to handle patch series conflicts Date: Thu, 06 Sep 2018 17:12:08 -0700 Message-ID: <1749364.tUMQzLrKjK@thunderbird> Organization: Personal References: <32028230.38oFsPliiV@thunderbird> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wednesday, September 5, 2018 2:16:06 PM MST Junio C Hamano wrote: > I think that one that is not even in 'pu' hasn't been looked at for > a long time; it is probably a good idea to discard and replace, if > you have something working. I submitted a working patch set yesterday. [1] https://public-inbox.org/git/20180906005329.11277-1-ischis2@cox.net/T/ #m3ed5a15721318f71064dbe7225be9242c3960e1c sps