From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <reyuki@gnuweeb.org>
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=1756348180;
	bh=kYTRHBr23iOMO6o2N6HDpST9qC91TTaTqzu6oVWsKEY=;
	h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject:
	 To:Cc:Content-Type: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=j3aBQXtSsOQiQIFvrA53nRdMAzPz9TfVmIsJcse4yMw6jzmEO77QTimEgnHTSIdZZ
	 fP+C7Wffzow8whbPLhAHcbn2rG/rMlFh4TPt9MV4ATfpxWqCCfFvlweGum3FM8latk
	 rvuRAsENC5wL0IrGU+7dqywdispYY4luiTYR9RU5DNWgwY6Ri9wtDLutT7V4NIRhGb
	 +Hoc9KSG5iwNCAP62cLy3eKl1wCyDzRYXU5girRuz3f0TdwofHd9Wa4YK9MxlQ7EYZ
	 1XQ5BJLxnT6GqS6PZDgan5kp1xkILA3uxqiHtjNLfTrbuvrP+vIDGPXWGuSU9C9VZh
	 uzuT3cO1MDKYQ==
Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54])
	by server-vie001.gnuweeb.org (Postfix) with ESMTPSA id 2FD473127F4D
	for <gwml@vger.gnuweeb.org>; Thu, 28 Aug 2025 02:29:40 +0000 (UTC)
Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-55f46ec2e00so297364e87.3
        for <gwml@vger.gnuweeb.org>; Wed, 27 Aug 2025 19:29:40 -0700 (PDT)
X-Forwarded-Encrypted: i=1; AJvYcCVlotMbxMLFvHdU59GG/ETMxzonGovKisSaee3L4PHZr8e+ouJOqfNB/cE4VsK4KhSrZlZj@vger.gnuweeb.org
X-Gm-Message-State: AOJu0Yw4fqrPy6QR4LpcwRGpQKjvrmZdb59DAddcW/CRbpKiTf2kw/se
	l83fv4ZseeOwxS9P/nYMLf5lL5fUVcsvvY3aPt8Oyx4+OH+VFm+8NS0rOefnUbhb+tk+gcmYfgO
	7D2uLLhmSI0USAR/G8G14cbIZB9gaaO4=
X-Google-Smtp-Source: AGHT+IHbBRuRgj0XsbAgr1qk1Lh4ZY847uk2ApoLvEni5kx1pWakQWsPmMRA5iGYyBPenJBiIKJU6vHL1NCAYf22bHI=
X-Received: by 2002:a05:6512:3b29:b0:55f:46cd:2c88 with SMTP id
 2adb3069b0e04-55f46cd3062mr3838340e87.9.1756348179508; Wed, 27 Aug 2025
 19:29:39 -0700 (PDT)
MIME-Version: 1.0
References: <CAADvAgpegzsanTUzrR91Kt0nmq97+1_gmD-rWtUBLO0p_Q3bXA@mail.gmail.com>
 <CAOG64qO6j82YncitigR-wV8uJMf0_s2x83d+9h1YGWRLT4EJuQ@mail.gmail.com>
 <CAADvAgpD=ywC7ZUwNOoUz_ZRS0c2=0R3H4PTnix3A8u5bstTZw@mail.gmail.com>
 <CAOG64qNcmXdb-e2ZS4Za1Y871xNeCNUNGhQNoaa7GS6GF=TzgQ@mail.gmail.com>
 <CAOG64qO9w0A3Zo3wTDzczvPVidhMGh-hEv6P8wk4WPQSB87jGQ@mail.gmail.com>
 <20250822195242.GA3236201-ammarfaizi2@gnuweeb.org> <CAADvAgo0jW44FtZ5D-epwuHzUmW7qTXmR=OgNWZhx7Y7+KVMBA@mail.gmail.com>
 <CAOG64qP7EgsuqcWbWETKSOe6V2_z0M2Ap7uyrvASfyzY+43QGg@mail.gmail.com>
 <20250823022847.GC3508499-ammarfaizi2@gnuweeb.org> <CAADvAgrxL_cYymPtAqq5LjkXCR9az-PPmL5gTD-knZ539eA=aQ@mail.gmail.com>
 <20250828001331.GA20836-ammarfaizi2@gnuweeb.org> <CAADvAgoHdFmenU7WjOnt51R2=1EGLBtytTSeb-5Q7sqWKTX_ww@mail.gmail.com>
In-Reply-To: <CAADvAgoHdFmenU7WjOnt51R2=1EGLBtytTSeb-5Q7sqWKTX_ww@mail.gmail.com>
From: Ahmad Gani <reyuki@gnuweeb.org>
Date: Thu, 28 Aug 2025 09:29:02 +0700
X-Gmail-Original-Message-ID: <CAADvAgq3fn_AAAv2aCHQUF1nJCVuCLzJ3MABUy4=6kcQMA+ibw@mail.gmail.com>
X-Gm-Features: Ac12FXxaxPyeSPEeJmcA5YTIh7nftXGueHY7cg5Bdrek9bPOtFTQ4hhK8EtLUkI
Message-ID: <CAADvAgq3fn_AAAv2aCHQUF1nJCVuCLzJ3MABUy4=6kcQMA+ibw@mail.gmail.com>
Subject: Re: [PATCH gwproxy v5 2/2] dnsparser: Add dns parser code
To: Ammar Faizi <ammarfaizi2@gnuweeb.org>
Cc: Alviro Iskandar Setiawan <alviro.iskandar@gnuweeb.org>, 
	"GNU/Weeb Mailing List" <gwml@vger.gnuweeb.org>
Content-Type: text/plain; charset="UTF-8"
List-Id: <gwml.vger.gnuweeb.org>

BTW, How to deal with divergent branches in git?
```
pick 318a29c80ad3 # github: codespell: Add 'TE' word
pick 5f25e0dec782 # github: codespell: Only spellcheck man dir
pick 84b09581bf25 # configure: Add '-Wno-format-truncation' flag
pick abe0c1334a0f # github: Add 'fetch-depth: 0' to codespell target
pick ab6096090cc7 # dnsparser: Add dns parser code
```

I picked commit abe0c1334a0f and edited it. However, when I pulled from
the master branch, it prompted me to either merge, rebase, or fast-forward.
I'm not sure which option to use in this case.

--
Ahmad Gani