[ofiwg] merging commits into github

[Xiong, Jianxin]

Yes, the option is needed for the man page updater. For manual merge, we should always use "rebase and merge".

> -----Original Message-----
> From: ofiwg <ofiwg-bounces at lists.openfabrics.org> On Behalf Of Zhang, Wei via ofiwg
> Sent: Friday, February 17, 2023 8:57 AM
> To: Hefty, Sean <sean.hefty at intel.com>; ofiwg at lists.openfabrics.org
> Subject: Re: [ofiwg] merging commits into github
> 
> This was the original issue
> 
> https://github.com/ofiwg/libfabric/issues/8101
> 
> Regarding this.
> 
> 
> 
> On 2/17/23, 8:46 AM, "Hefty, Sean" <sean.hefty at intel.com> wrote:
> 
>     CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you can confirm the
> sender and know the content is safe.
> 
> 
> 
>     > I thought "Rebase and merge" caused an issue, which was the man page was not
>     > automatically updated. Is that the case?
> 
>     Well, I removed the other option for now.  Maybe that's why I had kept it enabled?  I can't remember though.  Let me update a man page
> and see if the man page update fails.
> 
>     - Sean
> 
> _______________________________________________
> ofiwg mailing list
> ofiwg at lists.openfabrics.org
> https://lists.openfabrics.org/mailman/listinfo/ofiwg