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=1756349171;
	bh=/V2S09FJY6uQixVzUDMsKaV8oZBDTBhcRgQTIpbCqt0=;
	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=k1A4iAtu2gen876cciNqwrVrHjBEU2sXn+8th9QYvA098nbXDjIU+NAKEadpdc6zH
	 QCmJVtFI88SyGCPy27zTGEpMnxOxP2unUgNfM5wvtjO1mhMnk6yEI8I8Sx0QenBfa7
	 vCT1bW7o++q9xO7l7ZZolm5dDqgBUY5iW/wY41wJvsAC8pgUlpD9ebmEyFyiUFImd1
	 sAb2bOEEj3tCo9vyVDVDa0IjgBxdj8lBa0lXUhAPQ65uJP+We5LZNhxJ+Z6YZuOysL
	 4SiNuFsGx0J5+EwqP78yu3sg8qkJrudJd4DxBoXPTztr8rHFcLa0xU/13gK4+Pr+fx
	 Vv7q35diWxzCQ==
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 3224A3127F4D
	for <gwml@vger.gnuweeb.org>; Thu, 28 Aug 2025 02:46:11 +0000 (UTC)
Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-55f3ce45abcso530401e87.3
        for <gwml@vger.gnuweeb.org>; Wed, 27 Aug 2025 19:46:11 -0700 (PDT)
X-Forwarded-Encrypted: i=1; AJvYcCVs3QOlPeISBoiJswX00tMWzOpGbj57NGY+Ri08xZ6QH93JPU9YqG0P8enWfowd/dF/Bift@vger.gnuweeb.org
X-Gm-Message-State: AOJu0Yw0+A7sWHOYFgaTi2l10iX/2c+K9/XqGEuBEpTpl96/3G+APUuW
	8HS4K3LDlbJeNxP1/cQQ0NAW0zsIvGfAS5dRjInkIs0V3QK6fMECpUUz6wDGH9HpMNgxXwjqZw5
	Kgxnsk8tK9dpuzm5IuGUtYAYqHE2OD6I=
X-Google-Smtp-Source: AGHT+IGqV1kxWv23LQ4r+V4GhQ8zpHYIxY6nhTFeLmoTJD8J+9w01w9lfplr+7wLaXvN9bjyN4u+H9FhAeBs9YRLMqk=
X-Received: by 2002:a05:6512:138d:b0:55f:4f0f:6275 with SMTP id
 2adb3069b0e04-55f4f0f7ddfmr2526415e87.19.1756349170514; Wed, 27 Aug 2025
 19:46:10 -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>
 <CAADvAgq3fn_AAAv2aCHQUF1nJCVuCLzJ3MABUy4=6kcQMA+ibw@mail.gmail.com>
In-Reply-To: <CAADvAgq3fn_AAAv2aCHQUF1nJCVuCLzJ3MABUy4=6kcQMA+ibw@mail.gmail.com>
From: Ahmad Gani <reyuki@gnuweeb.org>
Date: Thu, 28 Aug 2025 09:45:33 +0700
X-Gmail-Original-Message-ID: <CAADvAgprGdEmOV+aBtv_Ayhw_eR5dzG7SXaTy_xpiXowXrQfJQ@mail.gmail.com>
X-Gm-Features: Ac12FXxBwZhzJrpVfV2hihE_DOzJtfjV5sE9KUhQpa5LkOvDiZ7_PkRQNkY2lFo
Message-ID: <CAADvAgprGdEmOV+aBtv_Ayhw_eR5dzG7SXaTy_xpiXowXrQfJQ@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"
Content-Transfer-Encoding: quoted-printable
List-Id: <gwml.vger.gnuweeb.org>

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:
```
# Make sure your master is up to date
git checkout master
git pull upstream master

# Switch to your feature branch
git checkout refactor-dns-feature

# Rebase your work onto updated master
git rebase master
```

However, I'm not sure if this is the correct way. It's different from what
Sir Ammar taught to me.

But I guess it's the same as a combination of the above snippet with
`git pull origin master --rebase`?

--
Ahmad Gani