search

boostorg / gil

Boost.GIL - Generic Image Library | Requires C++14 since Boost 1.80
https://boostorg.github.io/gil
Boost Software License 1.0
178 stars 163 forks source link

Add typo fix to master #665

Closed striezel closed 2 years ago

striezel commented 2 years ago

Description

This PR adds the changes of #521 to the master branch. It also includes updated release notes. (I hope I got the format right.)

References

See #521 for the original changes.

Since the commit f6a35532f05963804c83f6519955c6fd283a3978 of this PR is a commit from develop, please do not rebase or squash commits when merging. Commit f6a35532 should stay as it is. The intention is to keep master closer to develop, not duplicating commits from develop on master.

Tasklist

striezel commented 2 years ago

Sorry for the additional merge commit, but that was required to resolve a merge conflict.

mloskot commented 2 years ago

Something did not work during the conflict resolution as the diff markers make it in to the content, innit?

striezel commented 2 years ago

What do you mean? I do not see any diff markers here on my end.

But if it is a problem, then I can remove the merge commit.

mloskot commented 2 years ago

My apologies, mobile GitHub app made fun of me.

mloskot commented 2 years ago

There seem to be merge conflict though

striezel commented 2 years ago

My apologies, mobile GitHub app made fun of me.

Ah, I see.

In the meantime I've removed the merge commit via force push. (Was commit e06b9da0d866b32aa0b6fbf9c0d05bbefadd1778.) Shall I restore it? Or do you want to handle it?

striezel commented 2 years ago

There seem to be merge conflict though

Bad timing on my side. I just remove the merge commit, but restored it now. There should be no conflict now.

mloskot commented 2 years ago

Thanks

mloskot commented 2 years ago

As I mentioned in my comment reviewing this PR https://github.com/boostorg/gil/pull/670#pullrequestreview-971415430, this change should be reverted as we don't include in RELEASES.md any changes related to CI, configurations or other trivial chores.

I'm sorry, this merge was my mistake.