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_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=1754397960; bh=GytMtCriJdQmYirhuXiP5hDTG7Rm535QIfKYWZnldPU=; 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=jCMGeug7+MXg4Fhr8n+5wyLfdY4qvW8/YI8nG8uQeuzOdE90p3V3U6Dzf+/fP6Fw6 7ZSUbjPNTDqxGq7eUis90Ca1y7RqspDt12k8aCNypLnIslvSbLDQg5x4hl+6vMOjMM v2+zsQdeVvwBXtGpuSzrmDSguavkF8ABl2rehjcIAVBrKzP3E/lRPO3ofpH5nDXNXY nkFOV7VDrMXyDVUMPpXyl6WDPiY7DeQzos1MskgTQziQ4tGRT7+APVfEcT9XJ59bKS RjEz9RK3YU0THWufTn89ySTGUP5QDhXV8G44wjQ62m2/8WOgNggDB3PgHtDD6m99A3 shddqgu7lY8sQ== Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by server-vie001.gnuweeb.org (Postfix) with ESMTPSA id AB3EE3128058 for ; Tue, 5 Aug 2025 12:46:00 +0000 (UTC) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-55b9a23d633so3443140e87.1 for ; Tue, 05 Aug 2025 05:46:00 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCUtyok7SJEofF4yw/POD/L0rUNIFFGeOOeGgIA7qFs9mZbdAoHk96kbMdAsSHIvOlv+3bhU@vger.gnuweeb.org X-Gm-Message-State: AOJu0Yx4s5tE4sufgKNfY6XGTUIHbOJpIIdjESQo91D/j4k9VBFNOtDu OL1QfrMFiMdjUD+QilakA5k/cLR3vFi/Pn9jj11ug14JSzbbTW93PwXz1eZoTTf8WM3CoLZrTnD W3I0uiZbSkwFh6oPBeQkKGcN3Xc31XyU= X-Google-Smtp-Source: AGHT+IGGCPkjb6ZVmWFDz8gU9YFMQqzRbV9/wC2xH1VctfJ1/X2NvbOM+kAqNR8Duc44YwWvQ+iW7bVPTe6WAhlbajQ= X-Received: by 2002:a05:6512:689:b0:55b:7ff4:bb3b with SMTP id 2adb3069b0e04-55bab3fd84amr1043537e87.21.1754397960042; Tue, 05 Aug 2025 05:46:00 -0700 (PDT) MIME-Version: 1.0 References: <20250805064933.109080-1-reyuki@gnuweeb.org> <20250805064933.109080-3-reyuki@gnuweeb.org> In-Reply-To: From: Ahmad Gani Date: Tue, 5 Aug 2025 19:45:23 +0700 X-Gmail-Original-Message-ID: X-Gm-Features: Ac12FXybnS5BvH8p8OmSRY5Qx6AGLxBQFV8q8EIWW0SMaLXI4uvcgNzhXtmhgl4 Message-ID: Subject: Re: [PATCH gwproxy v3 2/9] dnslookup: Add a new parameter, default_port. 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: I messed up while fixing merge conflicts during git rebase --continue=E2=80= =94 I ended up amending the commit instead of making a new one! I continued the rebase, and when I looked at the history, the commit that previously conflicted had completely disappeared. Lol, I didn=E2=80=99t kno= w that could happen. Also, git apply refused to cooperate with the second patch file=E2=80=94it = just wouldn't apply. But fortunately, it wasn=E2=80=99t a big change. I can just rebase again an= d manually add the changes by looking at the second patch file. -- Ahmad Gani