From 5ee172dd8bc3424d9fddb95fec35f4b26d31461b Mon Sep 17 00:00:00 2001 From: ADBond <48208438+ADBond@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:25:46 +0000 Subject: [PATCH 1/2] fix typo in validation logs --- splink/settings_validation/column_lookups.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/splink/settings_validation/column_lookups.py b/splink/settings_validation/column_lookups.py index e55b9d209d..f4c6173743 100644 --- a/splink/settings_validation/column_lookups.py +++ b/splink/settings_validation/column_lookups.py @@ -309,7 +309,7 @@ def construct_comparison_level_log_strings(self, invalid_cls) -> str: # so this allows those entries without a name to pass # through. if cn is not None: - output_warning.append(f"Comarpison: {cn}") + output_warning.append(f"Comparison: {cn}") output_warning.append("--------------------------------------") output_warning.append(self.log_invalid_warnings_within_sql(cls)) From 2988873ef4843f96eb63fb31c71f6c80e7a1abe4 Mon Sep 17 00:00:00 2001 From: ADBond <48208438+ADBond@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:28:01 +0000 Subject: [PATCH 2/2] docs typo --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 54693524ef..971d911267 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -64,7 +64,7 @@ When making code changes, we recommend: As mentioned above, we like to keep PRs small and our philosophy on branching reflects that. Splink does not work with a `dev` branch, so all branches/forks should be made from `master` in the first instance. -For small PRs, simply branching from `master` and merging from there is perfectly fine. However, if you have a larger feature to add we tend to try and break these up into chunks. If you have a larger feature, please consider creating a simple minimum-viable feeature and submit for review. Once this has been reviewed by the Splink dev team there are two options to consider: +For small PRs, simply branching from `master` and merging from there is perfectly fine. However, if you have a larger feature to add we tend to try and break these up into chunks. If you have a larger feature, please consider creating a simple minimum-viable feature and submit for review. Once this has been reviewed by the Splink dev team there are two options to consider: 1. Merge minimal feature into master then create a new branch with additional features. 2. Do not merge the initial feature branch and create additional feature branches from the reviewed branch.