From: Ken Brown <kbrown@cornell.edu>
To: cygwin-developers@cygwin.com
Subject: Re: 3.3.0: Possible regression in cygwin DLL (Win10); fixed in snapshot
Date: Sun, 12 Dec 2021 08:36:13 -0500 [thread overview]
Message-ID: <f814681d-134b-9b8b-5008-1441f73668f5@cornell.edu> (raw)
In-Reply-To: <20211212222631.faffbddc15eb3b3a2cfa2768@nifty.ne.jp>
On 12/12/2021 8:26 AM, Takashi Yano wrote:
> On Fri, 12 Nov 2021 11:02:46 +0100
> Corinna Vinschen wrote:
>> In the meantime, you might want to merge your code into master, whenever
>> you think it's ready.
>
> I have rebased the topic/pipe branch to current master.
>
> In addition, I think we had already enough test period for
> new code in topic/pipe. What about merging it into master?
>
> Or does anyone have any concerns?
I think we're ready.
> BTW, how can we merge the topic/pipe branch? Using "git merge"?
> Or rebase master to topic/pipe branch, i.e. "git rebase topic/pipe"?
Since you've already rebased topic/pipe onto master, I think you can just
checkout master and do "git merge topic/pipe". It should just be a simple
fast-forward merge.
Ken
next prev parent reply other threads:[~2021-12-12 13:36 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAEv6GOB8PXHgHoz7hdJy6Bia2GWEmUDnTd252gTGinz2vuv=hA@mail.gmail.com>
[not found] ` <20211105123950.b118a7f2ba38379764df4c12@nifty.ne.jp>
[not found] ` <CAEv6GOA-y58YrftXgEgFrjqtOTHmfdu2Vrq76Lwn0suZpZ=U9w@mail.gmail.com>
[not found] ` <20211105170542.96ce6dd4ca32880ddfddd660@nifty.ne.jp>
[not found] ` <CAEv6GODiM88Xfhk9R3AcEW6UTYSzACzYe4C0gPoTYm=u9ZTqRQ@mail.gmail.com>
[not found] ` <20211106044116.698b465a5d8ed6ce2cc75c99@nifty.ne.jp>
[not found] ` <2cfa5de7-3b95-9062-4572-f36d304bc916@cornell.edu>
2021-11-06 6:10 ` Takashi Yano
2021-11-06 11:42 ` Corinna Vinschen
2021-11-06 12:02 ` Corinna Vinschen
2021-11-06 14:13 ` Takashi Yano
2021-11-06 17:20 ` Corinna Vinschen
2021-11-07 3:01 ` Takashi Yano
2021-11-06 16:38 ` Ken Brown
2021-11-06 17:20 ` Corinna Vinschen
2021-11-07 3:46 ` Takashi Yano
2021-11-07 22:20 ` Ken Brown
2021-11-08 8:23 ` Takashi Yano
2021-11-08 9:46 ` Corinna Vinschen
2021-11-10 8:30 ` Takashi Yano
2021-11-10 10:34 ` Corinna Vinschen
2021-11-10 13:30 ` Takashi Yano
2021-11-10 20:35 ` Corinna Vinschen
2021-11-10 21:32 ` Ken Brown
2021-11-11 16:11 ` Ken Brown
2021-11-12 8:38 ` Takashi Yano
2021-11-16 23:46 ` Takashi Yano
2021-11-17 8:10 ` Takashi Yano
2021-11-17 15:12 ` Ken Brown
2021-11-11 9:52 ` Corinna Vinschen
2021-11-11 11:12 ` Takashi Yano
2021-11-11 11:33 ` Corinna Vinschen
2021-11-11 12:02 ` Takashi Yano
2021-11-11 13:20 ` Takashi Yano
2021-11-11 16:07 ` Corinna Vinschen
2021-11-12 8:33 ` Takashi Yano
2021-11-12 10:02 ` Corinna Vinschen
2021-12-12 13:26 ` Takashi Yano
2021-12-12 13:36 ` Ken Brown [this message]
2021-12-13 11:15 ` Takashi Yano
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=f814681d-134b-9b8b-5008-1441f73668f5@cornell.edu \
--to=kbrown@cornell.edu \
--cc=cygwin-developers@cygwin.com \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).