chore: Sync 'master' into 'devel' (CONFLICTS — manual resolution needed) - #699
Closed
Adda0 wants to merge 10 commits into
Closed
chore: Sync 'master' into 'devel' (CONFLICTS — manual resolution needed)#699Adda0 wants to merge 10 commits into
Adda0 wants to merge 10 commits into
Conversation
Enables formatting for C++ code and formats all Mata C++ files.
Updates GHA workflow synchronising master with devel to always create a sync PR, even when there are merge conflicts.
Defines file sets in `CMakeLists.txt` for headers to prevent copying invalid files, such as macOS `.DS_Store`, when installing Mata. Fixes #339.
![github-actions[bot]](https://github.githubassets.com/images/gravatars/gravatar-user-420.png){kind=avatar}
Adda0
added
the
automated/sync
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated sync of 'master' into 'devel' after release. This branch has merge conflicts (committed with conflict markers) — resolve them manually in this PR before merging.