search

eclipse / kuksa.val

kuksa.val
Apache License 2.0
89 stars 52 forks source link

Merge V0.4.1 back to master #700

Closed erikbosch closed 8 months ago

erikbosch commented 8 months ago

For this PR I suggest to merge with a merge commit

SebastianSchildt commented 8 months ago

@erikbosch Plain merge seems we have disabled

image

Rebase or try the squash?

erikbosch commented 8 months ago

@SebastianSchildt - I assume it is some form of branch protection. We can rebase or squash, th only drawback is that it not will be as visible that the release branch has been "merged" back compared to if we would have a real merge commit.