eht16 left a comment (geany/geany-themes#88) It seems your base branch was not up to date or something else got wrong. Here are the commits of previous changed included which are merged already into the repository. This is why there are merge conflicts.
You should probably first sync your fork and then create a new feature branch for the new theme. -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany-themes/pull/88#issuecomment-2764596165 You are receiving this because you are subscribed to this thread. Message ID: <geany/geany-themes/pull/88/c2764596...@github.com>