Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update master after release 4.3.1 #322

Merged
merged 76 commits into from
Apr 22, 2024
Merged

Update master after release 4.3.1 #322

merged 76 commits into from
Apr 22, 2024

Conversation

stoerr
Copy link
Member

@stoerr stoerr commented Feb 15, 2024

Update master after new release

r.wunsch@ist-software.com and others added 30 commits November 23, 2023 20:43
…in-aem

 closes #316 return all restrictions if there are multiple restrictions
@stoerr stoerr requested a review from ist-rw February 15, 2024 18:22
@stoerr
Copy link
Member Author

stoerr commented Feb 15, 2024

@ist-rw Strangely, I cannot advance the master branch: the release job failed at that stage for an unknown reason and I cannot push to the master branch anymore, for an to me equally unknown reason. And merging this PR is not allowed, too. 8-} Can you please do that? Did you change anything there? Thanks!

For the record:
https://github.com/ist-dresden/composum-nodes/actions/runs/7915419390/job/21607217551 said:
hint: Updates were rejected because the remote contains work that you do not
hint: have locally. This is usually caused by another repository pushing to
hint: the same ref. If you want to integrate the remote changes, use
hint: 'git pull' before pushing again.

That doesn't make much sense to me at the moment. Master was contained in develop.

@stoerr stoerr changed the title Update master after release 4.3.0 Update master after release 4.3.1 Mar 21, 2024
@stoerr stoerr merged commit 49ddfe3 into master Apr 22, 2024
2 checks passed
@stoerr stoerr deleted the new-master branch April 22, 2024 11:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant