From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server-vie001.gnuweeb.org X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_DBL_BLOCKED_OPENDNS, URIBL_ZEN_BLOCKED_OPENDNS autolearn=ham autolearn_force=no version=3.4.6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=new2025; t=1756349573; bh=3LpgAn11+gRsYGkZnMDyQx3nfDDJRDLbmNJPU0xd99w=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type:Content-Transfer-Encoding:Message-ID:Date:From: Reply-To:Subject:To:Cc:In-Reply-To:References:Resent-Date: Resent-From:Resent-To:Resent-Cc:User-Agent:Content-Type: Content-Transfer-Encoding; b=lNSMJ2GwDBR7Whfg061+3NlBUYlb1s1w1WJqMoFWUAj7nEwOqtyyHZgGMBMoetMOB eMAp5te4WBVh/79X9d8IWbwE//UIJTAnqmBJyqGg/hfsEsbjX28NwM6PfciJNd7u+R qd1RRHBgbn2JS2zg5GakGBwqevuGOfcf2hDUxpYZeV1MI1UX2t6bYSpwE0GlNe5d4C pN9PYMyM1nKXcha97Oo+C5KxKucQ4oR5J2PlPXkrEfIhJD1sjSTAUgM1H+yWhWNIUh 1Wk73VmT2ATsgyTT+fV2Bm3NlkuDIUYtTfsyPh+sNW2E9O3pJ+AOVdRg+QpJ15rP4u Tcx7KlyIQ013A== Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by server-vie001.gnuweeb.org (Postfix) with ESMTPSA id A05583127F52 for ; Thu, 28 Aug 2025 02:52:53 +0000 (UTC) Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-3369d3513faso4552981fa.0 for ; Wed, 27 Aug 2025 19:52:53 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCVChjKWnRUqLmiDTtZqcHWJk22lE1+uuJNfBNokaaCd20AAd+5e6HfdgC0EnSf0G1UPHY8V@vger.gnuweeb.org X-Gm-Message-State: AOJu0YxgytDouDIcaXMJdCtygh1Kzjv0XiBvjnG1dcsKYrszd3hR/cDV jNk0mMbeA9JFxBRjO9wMVEC8Rkm0kxZ7jzZoqIvhE3rWcq4/dec5kVba0GII1fPxt2han7Hb81H 2Rb/yt87Rxt4n53cNGdMqTFTOGqvQMII= X-Google-Smtp-Source: AGHT+IFkYZAb0BOqIwewlTEN4yMgTeV73W2OY0/QXgKH+eikjLfOP+TxLI7aq3rTbhrN9cpPeH3d9JV+OGiZo0HolOg= X-Received: by 2002:a2e:a007:0:b0:336:6501:1aca with SMTP id 38308e7fff4ca-3368b723845mr14559751fa.9.1756349573016; Wed, 27 Aug 2025 19:52:53 -0700 (PDT) MIME-Version: 1.0 References: <20250822195242.GA3236201-ammarfaizi2@gnuweeb.org> <20250823022847.GC3508499-ammarfaizi2@gnuweeb.org> <20250828001331.GA20836-ammarfaizi2@gnuweeb.org> In-Reply-To: From: Ahmad Gani Date: Thu, 28 Aug 2025 09:52:15 +0700 X-Gmail-Original-Message-ID: X-Gm-Features: Ac12FXx4oz5kd0eW_Oeht5mnXf3viTAIouGoCXI2b2qWY0giJ6Bozyw2Ca7taTU Message-ID: Subject: Re: [PATCH gwproxy v5 2/2] dnsparser: Add dns parser code To: Ammar Faizi Cc: Alviro Iskandar Setiawan , "GNU/Weeb Mailing List" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable List-Id: On Thu, Aug 28, 2025 at 9:45=E2=80=AFAM Ahmad Gani wrote: > On Thu, Aug 28, 2025 at 9:29=E2=80=AFAM Ahmad Gani wrote: > > BTW, How to deal with divergent branches in git? > > I asked an AI, and it told me to do it differently Anyway, I ended up following the AI suggestion, and now I'm resolving the conflict. On Thu, Aug 28, 2025 at 9:29=E2=80=AFAM Ahmad Gani wrote: > I picked commit abe0c1334a0f and edited it. However, when I pulled from > the master branch, it prompted me to either merge, rebase, or fast-forwar= d. > I'm not sure which option to use in this case. It seems the rebase option is the correct way; it puts the patch series on top of the newest commits from the master branch. -- Ahmad Gani