flathub / org.frescobaldi.Frescobaldi

https://flathub.org/apps/details/org.frescobaldi.Frescobaldi
1 stars 3 forks source link

Beta branch: install Frescobaldi from git master #56

Closed fedelibre closed 1 month ago

flathubbot commented 2 months ago

Started test build 135310

flathubbot commented 2 months ago

Build 135310 failed

flathubbot commented 2 months ago

Started test build 135312

flathubbot commented 2 months ago

Build 135312 failed

fedelibre commented 2 months ago

Ok, I cannot use the branch. The next build should pass.

flathubbot commented 2 months ago

Started test build 135315

fedelibre commented 2 months ago

Ooops, it won't work. I forgot we removed the Makefile. I should use the changes from #37

flathubbot commented 2 months ago

Build 135315 failed

flathubbot commented 1 month ago

Started test build 135417

flathubbot commented 1 month ago

Build 135417 successful To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/118450/org.frescobaldi.Frescobaldi.flatpakref
fedelibre commented 1 month ago

@jeanas Do you know why GitHub says "This branch cannot be rebased due to conflicts"?

I can do the merge locally without any problem. But I cannot push from the terminal and skip this PR because the beta branch is protected.

fedelibre commented 1 month ago

Ok, I got it. It depends on the merge method. The "rebase merge" is disabled because of conflicts, while the "create merge commit" method is enabled.