Hi,
Just doing a dry run of the merge of release into develop and Im getting a
large number of conflicts with mustella baseline images.
Anyone have any idea why and if it's an issue? Perhaps they were checked into
the wrong branch or both branches and the develop branch after the release
branc
Hi,
I've updated;
https://cwiki.apache.org/confluence/display/FLEX/Release+Guide+for+the+SDK
In particular to take into account the develop and release branches.
This a slight issue with tagging the release as the release is built from the
release branch, but I assume we would want to tag the t
On 12/25/12 8:26 PM, "Justin Mclean" wrote:
> Hi,
>
> I've updated;
> https://cwiki.apache.org/confluence/display/FLEX/Release+Guide+for+the+SDK
>
> In particular to take into account the develop and release branches.
>
> This a slight issue with tagging the release as the release is built
I only checked the first file, but diff says it is the same, so not sure why
you are getting a conflict. Are you using the -reintegrate option? I moved
these from develop to release via merge, so theoretically the merge info
should know about them.
I don't think I would worry too much, if it jus
On Dec 25, 2012 8:30 PM, "Alex Harui" wrote:
>
>
>
>
> On 12/25/12 8:26 PM, "Justin Mclean" wrote:
>
> > Hi,
> >
> > I've updated;
> >
https://cwiki.apache.org/confluence/display/FLEX/Release+Guide+for+the+SDK
> >
> > In particular to take into account the develop and release branches.
> >
> > Th
Hi,
> I only checked the first file, but diff says it is the same, so not sure why
> you are getting a conflict. Are you using the -reintegrate option?
No I'm not, as far as I'm aware:
1. --reintegrate is not required in SVN 1.6+
2. We don't want to use --reintegrate as the release branch stil
