This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 9549aa8ba69e19d9afe6199f5683069eb2f1b7df Author: Martin Desruisseaux <[email protected]> AuthorDate: Mon Jul 21 17:05:26 2025 +0200 Corrections in the documentation about automatic reorganization of imports. --- .../java/org/apache/sis/buildtools/coding/ReorganizeImports.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java b/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java index 7840b294c6..1f9ebc2c51 100644 --- a/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java +++ b/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java @@ -73,11 +73,14 @@ import java.util.Set; * cd ../geoapi-3.1 * git diff * git add --update + * gradle test + * git stash * git merge geoapi-4.0 -s ours --no-commit + * git stash pop + * git add --update * gradle test * git diff - * git add --update - * git merge --continue --message "Merge of automatic reorganization of imports order." + * git commit --message "Merge of automatic reorganization of imports order." * } * * Finally apply the same pattern on the {@code main} branch.
