You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@royale.apache.org by Carlos Rovira <ca...@apache.org> on 2020/04/20 11:01:59 UTC
Re: [royale-compiler] branch release/0.9.7 updated: Update compiler
build tools version
Hi Yishay,
since I did the same in develop, will not be better to just cherry pick my
commit on release branch?
I think doing this way will make the merge to develop from release
problematic since will find different changes (although are the same) and
you'll need to resolve the merge manually.
maybe I'm wrong
Thanks
El lun., 20 abr. 2020 a las 12:58, <yi...@apache.org> escribió:
> This is an automated email from the ASF dual-hosted git repository.
>
> yishayw pushed a commit to branch release/0.9.7
> in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
>
>
> The following commit(s) were added to refs/heads/release/0.9.7 by this
> push:
> new 1b8f24a Update compiler build tools version
> 1b8f24a is described below
>
> commit 1b8f24aee6bf21d25ae75b039b88c00a596c46bb
> Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
> AuthorDate: Mon Apr 20 13:58:20 2020 +0300
>
> Update compiler build tools version
> ---
> pom.xml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/pom.xml b/pom.xml
> index 3fea91d..1ee3dd9 100644
> --- a/pom.xml
> +++ b/pom.xml
> @@ -47,7 +47,7 @@
>
> <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
> <maven.version>3.3.1</maven.version>
>
> - <compiler-build-tools.version>1.1.0</compiler-build-tools.version>
> + <compiler-build-tools.version>1.2.0</compiler-build-tools.version>
> <compiler-jburg-types.version>1.1.0</compiler-jburg-types.version>
>
> <flex.version>4.15.0</flex.version>
>
>
--
Carlos Rovira
http://about.me/carlosrovira
Re: [royale-compiler] branch release/0.9.7 updated: Update compiler
build tools version
Posted by Carlos Rovira <ca...@apache.org>.
Hi Chris,
I was checking doc online and I see you're right. The gitflow scheme I had
said that release branches are merged, but in actual documentation, release
branches goes to a dead end as you said. So I think this change through the
years and I never was aware (maybe my docs has around 10 years ;))
El mar., 21 abr. 2020 a las 17:08, Christofer Dutz (<
christofer.dutz@c-ware.de>) escribió:
> Hi all,
>
> Just a question from the sidelines...
>
> Where does anything have to be merged at all?
>
> Usually the release branches are simply dead ends and they aren't merged
> back to develop. Some projects merge the release tags to master, but noone
> merges the release branch back to develop. That would cause a mess anyway.
>
> So I don't quite understand where there are merge conflicts.
>
> Chris
> ________________________________
> Von: Carlos Rovira <ca...@apache.org>
> Gesendet: Dienstag, 21. April 2020 15:25
> An: Apache Royale Development <de...@royale.apache.org>
> Betreff: Re: [royale-compiler] branch release/0.9.7 updated: Update
> compiler build tools version
>
> Hi Alex,
>
> sorry to reach late to this. From other email from you what I understand
> was that we should continue our work in develop branch, while release was
> already cut and the commits that RM want to cherry pick was up to them. So
> I was acting with that in mind.
>
> Benign said that, merge conflicts can always happen at any time when
> merging. I was just recommending in that particular one to cherry pick,
> since that ensures no merge conflicts, but is clear that in other parts, we
> can be making more changes that conflict with actual release work and that
> needs to solved manually, but this is normal.
>
> thanks
>
>
>
>
> El lun., 20 abr. 2020 a las 17:32, Alex Harui (<ah...@adobe.com.invalid>)
> escribió:
>
> > IMO, dev branch should not have been updated as it did not need the code
> > change in 1.2.0. Cherry picking can also cause merge conflicts.
> >
> > But you can't eliminate the risks of merge conflicts. So just keep on
> > going with what is committed currently.
> >
> > -Alex
> >
> > On 4/20/20, 4:40 AM, "Yishay Weiss" <yi...@hotmail.com> wrote:
> >
> > Carlos, are you sure your commit belongs in dev at this stage? If we
> > are going to merge release into dev anyway, maybe it’s best to wait until
> > then to avoid this conflict. Also, I’m not a Git expert, but wouldn’t the
> > merge algorithm detect the identity in content anyway and avoid conflict?
> >
> > From: Piotr Zarzycki<ma...@gmail.com>
> > Sent: Monday, April 20, 2020 2:30 PM
> > To: Apache Royale Development<ma...@royale.apache.org>
> > Subject: Re: [royale-compiler] branch release/0.9.7 updated: Update
> > compiler build tools version
> >
> > Agree with Carlos - It may end up with problems. Actually after
> release
> > branch should be probably just merged to develop and probably master
> > (not
> > sure here) without changes.
> >
> > pon., 20 kwi 2020 o 13:27 Carlos Rovira <ca...@apache.org>
> > napisał(a):
> >
> > > Hi Yishay,
> > >
> > > since I did the same in develop, will not be better to just cherry
> > pick my
> > > commit on release branch?
> > > I think doing this way will make the merge to develop from release
> > > problematic since will find different changes (although are the
> > same) and
> > > you'll need to resolve the merge manually.
> > >
> > > maybe I'm wrong
> > >
> > > Thanks
> > >
> > >
> > > El lun., 20 abr. 2020 a las 12:58, <yi...@apache.org> escribió:
> > >
> > > > This is an automated email from the ASF dual-hosted git
> repository.
> > > >
> > > > yishayw pushed a commit to branch release/0.9.7
> > > > in repository
> >
> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitbox.apache.org%2Frepos%2Fasf%2Froyale-compiler.git&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541721500&sdata=q6T8B558JaACJJ7qSzbhsV1c4eBL774lU8%2FSuUmegu4%3D&reserved=0
> > > >
> > > >
> > > > The following commit(s) were added to refs/heads/release/0.9.7 by
> > this
> > > > push:
> > > > new 1b8f24a Update compiler build tools version
> > > > 1b8f24a is described below
> > > >
> > > > commit 1b8f24aee6bf21d25ae75b039b88c00a596c46bb
> > > > Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
> > > > AuthorDate: Mon Apr 20 13:58:20 2020 +0300
> > > >
> > > > Update compiler build tools version
> > > > ---
> > > > pom.xml | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/pom.xml b/pom.xml
> > > > index 3fea91d..1ee3dd9 100644
> > > > --- a/pom.xml
> > > > +++ b/pom.xml
> > > > @@ -47,7 +47,7 @@
> > > >
> > > >
> > >
> >
> <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
> > > > <maven.version>3.3.1</maven.version>
> > > >
> > > > -
> > <compiler-build-tools.version>1.1.0</compiler-build-tools.version>
> > > > +
> > <compiler-build-tools.version>1.2.0</compiler-build-tools.version>
> > > >
> > <compiler-jburg-types.version>1.1.0</compiler-jburg-types.version>
> > > >
> > > > <flex.version>4.15.0</flex.version>
> > > >
> > > >
> > >
> > > --
> > > Carlos Rovira
> > >
> >
> https://nam04.safelinks.protection.outlook.com/?url=http%3A%2F%2Fabout.me%2Fcarlosrovira&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541731496&sdata=oGWnWGINE4gGtezx2MeuZvo3cqc5CSvcx7AdrYJeWV8%3D&reserved=0
> > >
> >
> >
> > --
> >
> > Piotr Zarzycki
> >
> > Patreon: *
> >
> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541731496&sdata=C79G11fhsKtkw5%2BaffnMEjyUn0vBSQol%2B0b7UJjvatw%3D&reserved=0
> > <
> >
> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541731496&sdata=C79G11fhsKtkw5%2BaffnMEjyUn0vBSQol%2B0b7UJjvatw%3D&reserved=0
> > >*
> >
> >
> >
> >
>
> --
> Carlos Rovira
> http://about.me/carlosrovira
>
--
Carlos Rovira
http://about.me/carlosrovira
Re: [royale-compiler] branch release/0.9.7 updated: Update compiler
build tools version
Posted by Christofer Dutz <ch...@c-ware.de>.
Hi all,
Just a question from the sidelines...
Where does anything have to be merged at all?
Usually the release branches are simply dead ends and they aren't merged back to develop. Some projects merge the release tags to master, but noone merges the release branch back to develop. That would cause a mess anyway.
So I don't quite understand where there are merge conflicts.
Chris
________________________________
Von: Carlos Rovira <ca...@apache.org>
Gesendet: Dienstag, 21. April 2020 15:25
An: Apache Royale Development <de...@royale.apache.org>
Betreff: Re: [royale-compiler] branch release/0.9.7 updated: Update compiler build tools version
Hi Alex,
sorry to reach late to this. From other email from you what I understand
was that we should continue our work in develop branch, while release was
already cut and the commits that RM want to cherry pick was up to them. So
I was acting with that in mind.
Benign said that, merge conflicts can always happen at any time when
merging. I was just recommending in that particular one to cherry pick,
since that ensures no merge conflicts, but is clear that in other parts, we
can be making more changes that conflict with actual release work and that
needs to solved manually, but this is normal.
thanks
El lun., 20 abr. 2020 a las 17:32, Alex Harui (<ah...@adobe.com.invalid>)
escribió:
> IMO, dev branch should not have been updated as it did not need the code
> change in 1.2.0. Cherry picking can also cause merge conflicts.
>
> But you can't eliminate the risks of merge conflicts. So just keep on
> going with what is committed currently.
>
> -Alex
>
> On 4/20/20, 4:40 AM, "Yishay Weiss" <yi...@hotmail.com> wrote:
>
> Carlos, are you sure your commit belongs in dev at this stage? If we
> are going to merge release into dev anyway, maybe it’s best to wait until
> then to avoid this conflict. Also, I’m not a Git expert, but wouldn’t the
> merge algorithm detect the identity in content anyway and avoid conflict?
>
> From: Piotr Zarzycki<ma...@gmail.com>
> Sent: Monday, April 20, 2020 2:30 PM
> To: Apache Royale Development<ma...@royale.apache.org>
> Subject: Re: [royale-compiler] branch release/0.9.7 updated: Update
> compiler build tools version
>
> Agree with Carlos - It may end up with problems. Actually after release
> branch should be probably just merged to develop and probably master
> (not
> sure here) without changes.
>
> pon., 20 kwi 2020 o 13:27 Carlos Rovira <ca...@apache.org>
> napisał(a):
>
> > Hi Yishay,
> >
> > since I did the same in develop, will not be better to just cherry
> pick my
> > commit on release branch?
> > I think doing this way will make the merge to develop from release
> > problematic since will find different changes (although are the
> same) and
> > you'll need to resolve the merge manually.
> >
> > maybe I'm wrong
> >
> > Thanks
> >
> >
> > El lun., 20 abr. 2020 a las 12:58, <yi...@apache.org> escribió:
> >
> > > This is an automated email from the ASF dual-hosted git repository.
> > >
> > > yishayw pushed a commit to branch release/0.9.7
> > > in repository
> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitbox.apache.org%2Frepos%2Fasf%2Froyale-compiler.git&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541721500&sdata=q6T8B558JaACJJ7qSzbhsV1c4eBL774lU8%2FSuUmegu4%3D&reserved=0
> > >
> > >
> > > The following commit(s) were added to refs/heads/release/0.9.7 by
> this
> > > push:
> > > new 1b8f24a Update compiler build tools version
> > > 1b8f24a is described below
> > >
> > > commit 1b8f24aee6bf21d25ae75b039b88c00a596c46bb
> > > Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
> > > AuthorDate: Mon Apr 20 13:58:20 2020 +0300
> > >
> > > Update compiler build tools version
> > > ---
> > > pom.xml | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/pom.xml b/pom.xml
> > > index 3fea91d..1ee3dd9 100644
> > > --- a/pom.xml
> > > +++ b/pom.xml
> > > @@ -47,7 +47,7 @@
> > >
> > >
> >
> <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
> > > <maven.version>3.3.1</maven.version>
> > >
> > > -
> <compiler-build-tools.version>1.1.0</compiler-build-tools.version>
> > > +
> <compiler-build-tools.version>1.2.0</compiler-build-tools.version>
> > >
> <compiler-jburg-types.version>1.1.0</compiler-jburg-types.version>
> > >
> > > <flex.version>4.15.0</flex.version>
> > >
> > >
> >
> > --
> > Carlos Rovira
> >
> https://nam04.safelinks.protection.outlook.com/?url=http%3A%2F%2Fabout.me%2Fcarlosrovira&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541731496&sdata=oGWnWGINE4gGtezx2MeuZvo3cqc5CSvcx7AdrYJeWV8%3D&reserved=0
> >
>
>
> --
>
> Piotr Zarzycki
>
> Patreon: *
> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541731496&sdata=C79G11fhsKtkw5%2BaffnMEjyUn0vBSQol%2B0b7UJjvatw%3D&reserved=0
> <
> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541731496&sdata=C79G11fhsKtkw5%2BaffnMEjyUn0vBSQol%2B0b7UJjvatw%3D&reserved=0
> >*
>
>
>
>
--
Carlos Rovira
http://about.me/carlosrovira
Re: [royale-compiler] branch release/0.9.7 updated: Update compiler
build tools version
Posted by Carlos Rovira <ca...@apache.org>.
Hi Alex,
sorry to reach late to this. From other email from you what I understand
was that we should continue our work in develop branch, while release was
already cut and the commits that RM want to cherry pick was up to them. So
I was acting with that in mind.
Benign said that, merge conflicts can always happen at any time when
merging. I was just recommending in that particular one to cherry pick,
since that ensures no merge conflicts, but is clear that in other parts, we
can be making more changes that conflict with actual release work and that
needs to solved manually, but this is normal.
thanks
El lun., 20 abr. 2020 a las 17:32, Alex Harui (<ah...@adobe.com.invalid>)
escribió:
> IMO, dev branch should not have been updated as it did not need the code
> change in 1.2.0. Cherry picking can also cause merge conflicts.
>
> But you can't eliminate the risks of merge conflicts. So just keep on
> going with what is committed currently.
>
> -Alex
>
> On 4/20/20, 4:40 AM, "Yishay Weiss" <yi...@hotmail.com> wrote:
>
> Carlos, are you sure your commit belongs in dev at this stage? If we
> are going to merge release into dev anyway, maybe it’s best to wait until
> then to avoid this conflict. Also, I’m not a Git expert, but wouldn’t the
> merge algorithm detect the identity in content anyway and avoid conflict?
>
> From: Piotr Zarzycki<ma...@gmail.com>
> Sent: Monday, April 20, 2020 2:30 PM
> To: Apache Royale Development<ma...@royale.apache.org>
> Subject: Re: [royale-compiler] branch release/0.9.7 updated: Update
> compiler build tools version
>
> Agree with Carlos - It may end up with problems. Actually after release
> branch should be probably just merged to develop and probably master
> (not
> sure here) without changes.
>
> pon., 20 kwi 2020 o 13:27 Carlos Rovira <ca...@apache.org>
> napisał(a):
>
> > Hi Yishay,
> >
> > since I did the same in develop, will not be better to just cherry
> pick my
> > commit on release branch?
> > I think doing this way will make the merge to develop from release
> > problematic since will find different changes (although are the
> same) and
> > you'll need to resolve the merge manually.
> >
> > maybe I'm wrong
> >
> > Thanks
> >
> >
> > El lun., 20 abr. 2020 a las 12:58, <yi...@apache.org> escribió:
> >
> > > This is an automated email from the ASF dual-hosted git repository.
> > >
> > > yishayw pushed a commit to branch release/0.9.7
> > > in repository
> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitbox.apache.org%2Frepos%2Fasf%2Froyale-compiler.git&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541721500&sdata=q6T8B558JaACJJ7qSzbhsV1c4eBL774lU8%2FSuUmegu4%3D&reserved=0
> > >
> > >
> > > The following commit(s) were added to refs/heads/release/0.9.7 by
> this
> > > push:
> > > new 1b8f24a Update compiler build tools version
> > > 1b8f24a is described below
> > >
> > > commit 1b8f24aee6bf21d25ae75b039b88c00a596c46bb
> > > Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
> > > AuthorDate: Mon Apr 20 13:58:20 2020 +0300
> > >
> > > Update compiler build tools version
> > > ---
> > > pom.xml | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/pom.xml b/pom.xml
> > > index 3fea91d..1ee3dd9 100644
> > > --- a/pom.xml
> > > +++ b/pom.xml
> > > @@ -47,7 +47,7 @@
> > >
> > >
> >
> <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
> > > <maven.version>3.3.1</maven.version>
> > >
> > > -
> <compiler-build-tools.version>1.1.0</compiler-build-tools.version>
> > > +
> <compiler-build-tools.version>1.2.0</compiler-build-tools.version>
> > >
> <compiler-jburg-types.version>1.1.0</compiler-jburg-types.version>
> > >
> > > <flex.version>4.15.0</flex.version>
> > >
> > >
> >
> > --
> > Carlos Rovira
> >
> https://nam04.safelinks.protection.outlook.com/?url=http%3A%2F%2Fabout.me%2Fcarlosrovira&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541731496&sdata=oGWnWGINE4gGtezx2MeuZvo3cqc5CSvcx7AdrYJeWV8%3D&reserved=0
> >
>
>
> --
>
> Piotr Zarzycki
>
> Patreon: *
> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541731496&sdata=C79G11fhsKtkw5%2BaffnMEjyUn0vBSQol%2B0b7UJjvatw%3D&reserved=0
> <
> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541731496&sdata=C79G11fhsKtkw5%2BaffnMEjyUn0vBSQol%2B0b7UJjvatw%3D&reserved=0
> >*
>
>
>
>
--
Carlos Rovira
http://about.me/carlosrovira
Re: [royale-compiler] branch release/0.9.7 updated: Update compiler
build tools version
Posted by Alex Harui <ah...@adobe.com.INVALID>.
IMO, dev branch should not have been updated as it did not need the code change in 1.2.0. Cherry picking can also cause merge conflicts.
But you can't eliminate the risks of merge conflicts. So just keep on going with what is committed currently.
-Alex
On 4/20/20, 4:40 AM, "Yishay Weiss" <yi...@hotmail.com> wrote:
Carlos, are you sure your commit belongs in dev at this stage? If we are going to merge release into dev anyway, maybe it’s best to wait until then to avoid this conflict. Also, I’m not a Git expert, but wouldn’t the merge algorithm detect the identity in content anyway and avoid conflict?
From: Piotr Zarzycki<ma...@gmail.com>
Sent: Monday, April 20, 2020 2:30 PM
To: Apache Royale Development<ma...@royale.apache.org>
Subject: Re: [royale-compiler] branch release/0.9.7 updated: Update compiler build tools version
Agree with Carlos - It may end up with problems. Actually after release
branch should be probably just merged to develop and probably master (not
sure here) without changes.
pon., 20 kwi 2020 o 13:27 Carlos Rovira <ca...@apache.org>
napisał(a):
> Hi Yishay,
>
> since I did the same in develop, will not be better to just cherry pick my
> commit on release branch?
> I think doing this way will make the merge to develop from release
> problematic since will find different changes (although are the same) and
> you'll need to resolve the merge manually.
>
> maybe I'm wrong
>
> Thanks
>
>
> El lun., 20 abr. 2020 a las 12:58, <yi...@apache.org> escribió:
>
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > yishayw pushed a commit to branch release/0.9.7
> > in repository https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitbox.apache.org%2Frepos%2Fasf%2Froyale-compiler.git&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541721500&sdata=q6T8B558JaACJJ7qSzbhsV1c4eBL774lU8%2FSuUmegu4%3D&reserved=0
> >
> >
> > The following commit(s) were added to refs/heads/release/0.9.7 by this
> > push:
> > new 1b8f24a Update compiler build tools version
> > 1b8f24a is described below
> >
> > commit 1b8f24aee6bf21d25ae75b039b88c00a596c46bb
> > Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
> > AuthorDate: Mon Apr 20 13:58:20 2020 +0300
> >
> > Update compiler build tools version
> > ---
> > pom.xml | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/pom.xml b/pom.xml
> > index 3fea91d..1ee3dd9 100644
> > --- a/pom.xml
> > +++ b/pom.xml
> > @@ -47,7 +47,7 @@
> >
> >
> <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
> > <maven.version>3.3.1</maven.version>
> >
> > - <compiler-build-tools.version>1.1.0</compiler-build-tools.version>
> > + <compiler-build-tools.version>1.2.0</compiler-build-tools.version>
> > <compiler-jburg-types.version>1.1.0</compiler-jburg-types.version>
> >
> > <flex.version>4.15.0</flex.version>
> >
> >
>
> --
> Carlos Rovira
> https://nam04.safelinks.protection.outlook.com/?url=http%3A%2F%2Fabout.me%2Fcarlosrovira&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541731496&sdata=oGWnWGINE4gGtezx2MeuZvo3cqc5CSvcx7AdrYJeWV8%3D&reserved=0
>
--
Piotr Zarzycki
Patreon: *https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541731496&sdata=C79G11fhsKtkw5%2BaffnMEjyUn0vBSQol%2B0b7UJjvatw%3D&reserved=0
<https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C0126494d6a6e42a426a708d7e51fab8e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637229796541731496&sdata=C79G11fhsKtkw5%2BaffnMEjyUn0vBSQol%2B0b7UJjvatw%3D&reserved=0>*
RE: [royale-compiler] branch release/0.9.7 updated: Update compiler
build tools version
Posted by Yishay Weiss <yi...@hotmail.com>.
Carlos, are you sure your commit belongs in dev at this stage? If we are going to merge release into dev anyway, maybe it’s best to wait until then to avoid this conflict. Also, I’m not a Git expert, but wouldn’t the merge algorithm detect the identity in content anyway and avoid conflict?
From: Piotr Zarzycki<ma...@gmail.com>
Sent: Monday, April 20, 2020 2:30 PM
To: Apache Royale Development<ma...@royale.apache.org>
Subject: Re: [royale-compiler] branch release/0.9.7 updated: Update compiler build tools version
Agree with Carlos - It may end up with problems. Actually after release
branch should be probably just merged to develop and probably master (not
sure here) without changes.
pon., 20 kwi 2020 o 13:27 Carlos Rovira <ca...@apache.org>
napisał(a):
> Hi Yishay,
>
> since I did the same in develop, will not be better to just cherry pick my
> commit on release branch?
> I think doing this way will make the merge to develop from release
> problematic since will find different changes (although are the same) and
> you'll need to resolve the merge manually.
>
> maybe I'm wrong
>
> Thanks
>
>
> El lun., 20 abr. 2020 a las 12:58, <yi...@apache.org> escribió:
>
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > yishayw pushed a commit to branch release/0.9.7
> > in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
> >
> >
> > The following commit(s) were added to refs/heads/release/0.9.7 by this
> > push:
> > new 1b8f24a Update compiler build tools version
> > 1b8f24a is described below
> >
> > commit 1b8f24aee6bf21d25ae75b039b88c00a596c46bb
> > Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
> > AuthorDate: Mon Apr 20 13:58:20 2020 +0300
> >
> > Update compiler build tools version
> > ---
> > pom.xml | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/pom.xml b/pom.xml
> > index 3fea91d..1ee3dd9 100644
> > --- a/pom.xml
> > +++ b/pom.xml
> > @@ -47,7 +47,7 @@
> >
> >
> <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
> > <maven.version>3.3.1</maven.version>
> >
> > - <compiler-build-tools.version>1.1.0</compiler-build-tools.version>
> > + <compiler-build-tools.version>1.2.0</compiler-build-tools.version>
> > <compiler-jburg-types.version>1.1.0</compiler-jburg-types.version>
> >
> > <flex.version>4.15.0</flex.version>
> >
> >
>
> --
> Carlos Rovira
> http://about.me/carlosrovira
>
--
Piotr Zarzycki
Patreon: *https://www.patreon.com/piotrzarzycki
<https://www.patreon.com/piotrzarzycki>*
Re: [royale-compiler] branch release/0.9.7 updated: Update compiler
build tools version
Posted by Piotr Zarzycki <pi...@gmail.com>.
Agree with Carlos - It may end up with problems. Actually after release
branch should be probably just merged to develop and probably master (not
sure here) without changes.
pon., 20 kwi 2020 o 13:27 Carlos Rovira <ca...@apache.org>
napisał(a):
> Hi Yishay,
>
> since I did the same in develop, will not be better to just cherry pick my
> commit on release branch?
> I think doing this way will make the merge to develop from release
> problematic since will find different changes (although are the same) and
> you'll need to resolve the merge manually.
>
> maybe I'm wrong
>
> Thanks
>
>
> El lun., 20 abr. 2020 a las 12:58, <yi...@apache.org> escribió:
>
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > yishayw pushed a commit to branch release/0.9.7
> > in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
> >
> >
> > The following commit(s) were added to refs/heads/release/0.9.7 by this
> > push:
> > new 1b8f24a Update compiler build tools version
> > 1b8f24a is described below
> >
> > commit 1b8f24aee6bf21d25ae75b039b88c00a596c46bb
> > Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
> > AuthorDate: Mon Apr 20 13:58:20 2020 +0300
> >
> > Update compiler build tools version
> > ---
> > pom.xml | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/pom.xml b/pom.xml
> > index 3fea91d..1ee3dd9 100644
> > --- a/pom.xml
> > +++ b/pom.xml
> > @@ -47,7 +47,7 @@
> >
> >
> <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
> > <maven.version>3.3.1</maven.version>
> >
> > - <compiler-build-tools.version>1.1.0</compiler-build-tools.version>
> > + <compiler-build-tools.version>1.2.0</compiler-build-tools.version>
> > <compiler-jburg-types.version>1.1.0</compiler-jburg-types.version>
> >
> > <flex.version>4.15.0</flex.version>
> >
> >
>
> --
> Carlos Rovira
> http://about.me/carlosrovira
>
--
Piotr Zarzycki
Patreon: *https://www.patreon.com/piotrzarzycki
<https://www.patreon.com/piotrzarzycki>*