Thanks Mike,
That's what I did long time ago (see our repo). It seems to only have an effect
if there's a conflict. When it's automatic it just merges.
Uwe
Am 22. November 2022 21:16:21 MEZ schrieb Mike Drob :
>In .gitattributes add a line
>asf.yaml merge=ours
>
>On Tue, Nov 22, 2022 at 11:54 A
In .gitattributes add a line
asf.yaml merge=ours
On Tue, Nov 22, 2022 at 11:54 AM Uwe Schindler wrote:
> Hi I fixed this.
>
> This was caused because due to maerging from main->production the fix of
> .asf.yaml was merged, too (this was caused by repairing the problems from
> lucenepy with a dup
Thanks Uwe!
On Tue, Nov 22, 2022 at 6:54 PM Uwe Schindler wrote:
> Hi I fixed this.
>
> This was caused because due to maerging from main->production the fix of
> .asf.yaml was merged, too (this was caused by repairing the problems from
> lucenepy with a duplicate master branch). So the producti
Hi I fixed this.
This was caused because due to maerging from main->production the fix of
.asf.yaml was merged, too (this was caused by repairing the problems
from lucenepy with a duplicate master branch). So the production branch
was building but was deployed to Staging.
I tried to exclude
Hello,
I've managed to make changes to the website for 9.4.2 and they are
correctly reflected on lucene.staged.apache.org. However pushing to the
`production` branch doesn't seem to trigger a build on
https://ci2.apache.org/#/builders/3 and I'm not seeing the production
website getting updated eit
