search

mbeddr / mbeddr.core

The mbeddr core. An extensible C
Eclipse Public License 2.0
224 stars 77 forks source link

Merge maintenance/mps20223 into master #2411

Closed github-actions[bot] closed 2 months ago

github-actions[bot] commented 2 months ago

Merge changes from maintenance/mps20223 to master.

kbirken commented 2 months ago

Don't know how to resolve this conflict, it seems it doesn't have any relation to my earlier changes.

alexanderpann commented 2 months ago

For the next time: merge the target branch into the merge branch. There were no merge conflicts.

kbirken commented 2 months ago

For the next time: merge the target branch into the merge branch. There were no merge conflicts.

Hm, when I wrote my previous comment, this PR page complained about merge conflicts and the button was greyed out. Next time I'll screenshot it :-)

alexanderpann commented 2 months ago

This is the expected behavior. You have to check out the branch yourself and manually resolve any issues.