Re: Merge #166 ?
Alexander Hansen <[email protected]> Wed, 12 Dec 2018 09:11:40 -0800
| Newsgroups | gmane.os.apple.fink.core |
|---|---|
| Message-ID | <[email protected]> |
--===============8798371631362536219==
Content-Type: multipart/alternative;
boundary="_452B18C8-1D28-4F54-99D7-F9A15C9D0848_"
--_452B18C8-1D28-4F54-99D7-F9A15C9D0848_
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"
If the web UI works like it does in GitLab, what might happen is that your =
changes get sent to a new branch if you don=E2=80=99t have write privileges=
to the branch. However, in GitLab admins can redirect merge requests to a=
lternate branches, so it=E2=80=99s probably best not to assume too much.
I=E2=80=99m going to have some Fink time due to unforeseen and unpleasant c=
ircumstances, so I can do a release and document the procedure I follow onc=
e we=E2=80=99re ready.
Sent from Mail for Windows 10
From: Hanspeter Niederstrasser
Sent: Wednesday, December 12, 2018 2:11 AM
To: Alexander Hansen; fink-core
Subject: Re: [fink-core] Merge #166 ?
On 12/11/18 11:14 PM, Alexander Hansen wrote:
> I was thinking that it might help us if we do the aforementioned merge to=
facilitate community testing, etc.
>=20
> -akh
I'm OK with that. TheSin said he'd added a couple local changes on top=20
of jwhowarth's pull and been running OK with them. I *think* it might be=20
possible to edit the files via the web interface even though the pull=20
comes from jwhowarth's clone. I know I can see the edit pencil icon, but=20
I haven't tried to actually save a change.
Might be good to have those changes then merge, or just merge as is and=20
then ask TheSin to make a pull for his changes and merge them quickly.
Hanspeter
--_452B18C8-1D28-4F54-99D7-F9A15C9D0848_
Content-Transfer-Encoding: quoted-printable
Content-Type: text/html; charset="utf-8"
<html xmlns:o=3D"urn:schemas-microsoft-com:office:office" xmlns:w=3D"urn:sc=
hemas-microsoft-com:office:word" xmlns:m=3D"http://schemas.microsoft.com/of=
fice/2004/12/omml" xmlns=3D"http://www.w3.org/TR/REC-html40"><head><meta ht=
tp-equiv=3DContent-Type content=3D"text/html; charset=3Dutf-8"><meta name=
=3DGenerator content=3D"Microsoft Word 15 (filtered medium)"><style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:#954F72;
text-decoration:underline;}
.MsoChpDefault
{mso-style-type:export-only;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style></head><body lang=3DEN-US link=3Dblue vlink=3D"#954F72"><div cla=
ss=3DWordSection1><p class=3DMsoNormal>If the web UI works like it does in =
GitLab, what might happen is that your changes get sent to a new branch if =
you don=E2=80=99t have write privileges to the branch.=C2=A0 However, in Gi=
tLab admins can redirect merge requests to alternate branches, so it=E2=80=
=99s probably best not to assume too much.</p><p class=3DMsoNormal><o:p>&nb=
sp;</o:p></p><p class=3DMsoNormal>I=E2=80=99m going to have some Fink time =
due to unforeseen and unpleasant circumstances, so I can do a release and d=
ocument the procedure I follow once we=E2=80=99re ready.</p><p class=3DMsoN=
ormal><o:p> </o:p></p><p class=3DMsoNormal>Sent from <a href=3D"https:=
//go.microsoft.com/fwlink/?LinkId=3D550986">Mail</a> for Windows 10</p><p c=
lass=3DMsoNormal><o:p> </o:p></p><div style=3D'mso-element:para-border=
-div;border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in'>=
<p class=3DMsoNormal style=3D'border:none;padding:0in'><b>From: </b><a href=
=3D"mailto:[email protected]">Hanspeter Niederstrasser</a><br><b>Sent:=
</b>Wednesday, December 12, 2018 2:11 AM<br><b>To: </b><a href=3D"mailto:a=
[email protected]">Alexander Hansen</a>; <a href=3D"mailto:fink-co=
[email protected]">fink-core</a><br><b>Subject: </b>Re: [fink-core] =
Merge #166 ?</p></div><p class=3DMsoNormal><o:p> </o:p></p><p class=3D=
MsoNormal>On 12/11/18 11:14 PM, Alexander Hansen wrote:</p><p class=3DMsoNo=
rmal>> I was thinking that it might help us if we do the aforementioned =
merge to facilitate community testing, etc.</p><p class=3DMsoNormal>> </=
p><p class=3DMsoNormal>> -akh</p><p class=3DMsoNormal><o:p> </o:p><=
/p><p class=3DMsoNormal>I'm OK with that. TheSin said he'd added a couple l=
ocal changes on top </p><p class=3DMsoNormal>of jwhowarth's pull and been r=
unning OK with them. I *think* it might be </p><p class=3DMsoNormal>possibl=
e to edit the files via the web interface even though the pull </p><p class=
=3DMsoNormal>comes from jwhowarth's clone. I know I can see the edit pencil=
icon, but </p><p class=3DMsoNormal>I haven't tried to actually save a chan=
ge.</p><p class=3DMsoNormal><o:p> </o:p></p><p class=3DMsoNormal>Might=
be good to have those changes then merge, or just merge as is and </p><p c=
lass=3DMsoNormal>then ask TheSin to make a pull for his changes and merge t=
hem quickly.</p><p class=3DMsoNormal><o:p> </o:p></p><p class=3DMsoNor=
mal>Hanspeter</p><p class=3DMsoNormal><o:p> </o:p></p></div></body></h=
tml>=
--_452B18C8-1D28-4F54-99D7-F9A15C9D0848_--
--===============8798371631362536219==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
--===============8798371631362536219==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
fink-core mailing list
[email protected]
List archive:
http://news.gmane.org/gmane.os.apple.fink.core
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-core
--===============8798371631362536219==--