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<mailto:[email protected]> Sent: Monday, April 20, 2020 2:30 PM To: Apache Royale Development<mailto:[email protected]> 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 <[email protected]> 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, <[email protected]> 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 <[email protected]> > > 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>*
