Re: [openoffice] branch trunk updated: Update url_transfer.htm

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: Update url_transfer.htm

Matthias Seidel
Hi Pedro,

I think this was your first commit with Git? Congratulations!

This seems to be safe to be "cherry-picked" from trunk for AOO42X:

git checkout AOO42X
git pull
git cherry-pick -x 5215491
git push origin AOO42X

Regards,

   Matthias

Am 05.02.21 um 00:02 schrieb [hidden email]:

> This is an automated email from the ASF dual-hosted git repository.
>
> plino pushed a commit to branch trunk
> in repository https://gitbox.apache.org/repos/asf/openoffice.git
>
>
> The following commit(s) were added to refs/heads/trunk by this push:
>      new 5215491  Update url_transfer.htm
> 5215491 is described below
>
> commit 52154912a3595e2eb122f2f07e9469c9134fc1ff
> Author: Pedro Lino <[hidden email]>
> AuthorDate: Thu Feb 4 23:01:36 2021 +0000
>
>     Update url_transfer.htm
> ---
>  main/extras/source/templates/wizard/desktop/lang/pt/url_transfer.htm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/main/extras/source/templates/wizard/desktop/lang/pt/url_transfer.htm b/main/extras/source/templates/wizard/desktop/lang/pt/url_transfer.htm
> index b30d1e3..0970434 100644
> --- a/main/extras/source/templates/wizard/desktop/lang/pt/url_transfer.htm
> +++ b/main/extras/source/templates/wizard/desktop/lang/pt/url_transfer.htm
> @@ -70,7 +70,7 @@
>   <TD WIDTH=480>
>   <P><FONT SIZE=2><FONT FACE="Arial, sans-serif">Seleccione o
>   URL que aparece na linha de entrada do URL, por exemplo:
> - <A HREF="https://www.openoffice.org">https://www.openoffice.org</A>).</FONT></FONT></P>
> + <A HREF="https://www.openoffice.org">https://www.openoffice.org</A>.</FONT></FONT></P>
>   </TD>
>   </TR>
>   <TR VALIGN=TOP>
>
>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: Update url_transfer.htm

Pedro Lino-4
Hi Mathias

> I think this was your first commit with Git? Congratulations!

I had done a previous one but it was for the website.
 
> This seems to be safe to be "cherry-picked" from trunk for AOO42X:
>
> git checkout AOO42X
> git pull
> git cherry-pick -x 5215491
> git push origin AOO42X

Unfortunately that doesn't work...
It won't accept my password which I know is correct.
I think it's because I enabled 2 Factor Authentication to be able to commit in Github...

Is there a way to cherry pick in Github???

I can simply switch branches and do the same modification on the 42x branch but I'm sure there has to be an easier way (for people who modify multiple lines of code)?

Regards,
Pedro

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: Update url_transfer.htm

Matthias Seidel
Hi Pedro,

Am 07.02.21 um 23:44 schrieb Pedro Lino:

> Hi Mathias
>
>> I think this was your first commit with Git? Congratulations!
> I had done a previous one but it was for the website.
>  
>> This seems to be safe to be "cherry-picked" from trunk for AOO42X:
>>
>> git checkout AOO42X
>> git pull
>> git cherry-pick -x 5215491
>> git push origin AOO42X
> Unfortunately that doesn't work...
> It won't accept my password which I know is correct.
> I think it's because I enabled 2 Factor Authentication to be able to commit in Github...
>
> Is there a way to cherry pick in Github???
>
> I can simply switch branches and do the same modification on the 42x branch but I'm sure there has to be an easier way (for people who modify multiple lines of code)?
This is the easiest way... ;-)

Did you checkout from GitHub or from Gitbox?
If Gitbox, you need to use your ASF credentials.

Regards,

   Matthias

>
> Regards,
> Pedro
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: Update url_transfer.htm

Pedro Lino-4
Hi Mathias

> On 02/07/2021 10:48 PM Matthias Seidel <[hidden email]> wrote:

> This is the easiest way... ;-)

Ok. I expected a point and click option would be available at the Github website...
 
> Did you checkout from GitHub or from Gitbox?

Thanks to this question I noticed that the Terminal prompt was asking for the Gitbox credentials and I was typing the Github credentials :)

> If Gitbox, you need to use your ASF credentials.

Yes... I only figured that out now :)

Thank you again for teaching me to fish ;)

Regards,
Pedro

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]