From: Ahmad Gani <reyuki@gnuweeb.org>
To: Ammar Faizi <ammarfaizi2@gnuweeb.org>
Cc: Alviro Iskandar Setiawan <alviro.iskandar@gnuweeb.org>,
"GNU/Weeb Mailing List" <gwml@vger.gnuweeb.org>
Subject: Re: [PATCH gwproxy v3 2/9] dnslookup: Add a new parameter, default_port.
Date: Tue, 5 Aug 2025 19:45:23 +0700 [thread overview]
Message-ID: <CAADvAgr17=cSzj7AswYzZufVB=TOm=HGzVvQcdqXVuwj034uKw@mail.gmail.com> (raw)
In-Reply-To: <aJHg7FFZdg6Z5FNg@linux.gnuweeb.org>
I messed up while fixing merge conflicts during git rebase --continue—
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’t know that
could happen.
Also, git apply refused to cooperate with the second patch file—it just
wouldn't apply.
But fortunately, it wasn’t a big change. I can just rebase again and manually
add the changes by looking at the second patch file.
--
Ahmad Gani
next prev parent reply other threads:[~2025-08-05 12:46 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-05 6:49 [PATCH gwproxy v3 0/9] Initial work for DNS lookup implementation Ahmad Gani
2025-08-05 6:49 ` [PATCH gwproxy v3 1/9] dnslookup: Split common functionality and struct into net.h and net.c Ahmad Gani
2025-08-05 9:26 ` Ammar Faizi
2025-08-05 6:49 ` [PATCH gwproxy v3 2/9] dnslookup: Add a new parameter, default_port Ahmad Gani
2025-08-05 9:26 ` Ammar Faizi
2025-08-05 10:15 ` reyuki
2025-08-05 10:26 ` Ammar Faizi
2025-08-05 10:43 ` Ahmad Gani
2025-08-05 10:46 ` Ammar Faizi
2025-08-05 12:45 ` Ahmad Gani [this message]
2025-08-05 6:49 ` [PATCH gwproxy v3 3/9] dnslookup: Allow only port string number Ahmad Gani
2025-08-05 6:49 ` [PATCH gwproxy v3 4/9] dnslookup: Initial work for implementation of C-ares-like getaddrinfo function Ahmad Gani
2025-08-05 6:49 ` [PATCH gwproxy v3 5/9] dnsparser: Update unit test of dns parser Ahmad Gani
2025-08-05 9:27 ` Ammar Faizi
2025-08-05 6:49 ` [PATCH gwproxy v3 6/9] dnsparser: Fix serialize_answ function Ahmad Gani
2025-08-05 9:26 ` Ammar Faizi
2025-08-05 12:47 ` Ahmad Gani
2025-08-05 13:04 ` Ammar Faizi
2025-08-05 13:12 ` Ahmad Gani
2025-08-05 13:51 ` Ahmad Gani
2025-08-05 14:02 ` Ammar Faizi
2025-08-05 6:49 ` [PATCH gwproxy v3 7/9] dnsparser: Transaction id creation is delegated to caller Ahmad Gani
2025-08-05 6:49 ` [PATCH gwproxy v3 8/9] dnslookup: Make gw_ares_getaddrinfo asynchronous Ahmad Gani
2025-08-05 6:49 ` [PATCH gwproxy v3 9/9] dnslookup: code style changes Ahmad Gani
2025-08-05 9:26 ` Ammar Faizi
2025-08-05 13:22 ` [PATCH gwproxy v3 0/9] Initial work for DNS lookup implementation Ammar Faizi
2025-08-05 13:28 ` Ahmad Gani
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAADvAgr17=cSzj7AswYzZufVB=TOm=HGzVvQcdqXVuwj034uKw@mail.gmail.com' \
--to=reyuki@gnuweeb.org \
--cc=alviro.iskandar@gnuweeb.org \
--cc=ammarfaizi2@gnuweeb.org \
--cc=gwml@vger.gnuweeb.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox