Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Remove pending snap file
Maximilian Roos3912c6b29007
diff --git a/tests/integration_tests/.merge.rs.pending-snap b/tests/integration_tests/.merge.rs.pending-snapdeleted file mode 100644index 05de8b59c..000000000--- a/tests/integration_tests/.merge.rs.pending-snap+++ /dev/null@@ -1,11 +0,0 @@-{"run_id":"1763938884-368831000","line":2260,"new":{"module_name":"integration__integration_tests__merge","snapshot_name":"merge_no_commit_with_clean_tree","metadata":{"source":"tests/integration_tests/merge.rs","assertion_line":2260,"info":{"program":"wt","args":["merge","main","--no-commit","--no-remove"],"env":{"CLICOLOR_FORCE":"1","COLUMNS":"150","GIT_AUTHOR_DATE":"2025-01-01T00:00:00Z","GIT_COMMITTER_DATE":"2025-01-01T00:00:00Z","GIT_CONFIG_GLOBAL":"[TEST_GIT_CONFIG]","GIT_CONFIG_SYSTEM":"/dev/null","GIT_EDITOR":"","LANG":"C","LC_ALL":"C","SOURCE_DATE_EPOCH":"1761609600","WORKTRUNK_CONFIG_PATH":"[TEST_CONFIG]"}}},"snapshot":"success: true\nexit_code: 0\n----- stdout -----\nπ \u001b[36mMerging 1 commit to \u001b[1m\u001b[36mmain\u001b[0m\u001b[36m @ \u001b[2m[SHA]\u001b[0m (no commit/squash/rebase needed)\n\u001b[107m \u001b[0m * [SHA]\u001b[33m (\u001b[m\u001b[1;36mHEAD\u001b[m\u001b[33m -> \u001b[m\u001b[1;32mfeature\u001b[m\u001b[33m)\u001b[m Add feature file\n\n\u001b[107m \u001b[0m feature.txt | 1 \u001b[32m+\u001b[m\n\u001b[107m \u001b[0m 1 file changed, 1 insertion(+)\n\nβ \u001b[32mMerged to \u001b[1m\u001b[32mmain\u001b[0m\u001b[0m (1 commit, 1 file, \u001b[32m+1\u001b[0m)\nβ \u001b[32mWorktree preserved (--no-remove)\u001b[0m\n\n----- stderr -----"},"old":{"module_name":"integration__integration_tests__merge","metadata":{},"snapshot":"success: true\nexit_code: 0\n----- stdout -----\nπ \u001b[36mMerging 1 commit to \u001b[1m\u001b[36mmain\u001b[0m\u001b[36m @ \u001b[2m[SHA]\u001b[0m (no commit/squash/rebase needed)\n\u001b[107m \u001b[0m * [SHA]\u001b[33m (\u001b[m\u001b[1;36mHEAD\u001b[m\u001b[33m -> \u001b[m\u001b[1;32mfeature\u001b[m\u001b[33m)\u001b[m Add feature file\n\u001b[107m \u001b[0m feature.txt | 1 \u001b[32m+\u001b[m\n\u001b[107m \u001b[0m 1 file changed, 1 insertion(+)\nβ \u001b[32mMerged to \u001b[1m\u001b[32mmain\u001b[0m\u001b[0m (1 commit, 1 file, \u001b[32m+1\u001b[0m)\nβ \u001b[32mWorktree preserved (--no-remove)\u001b[0m\n\n----- stderr -----"}}-{"run_id":"1763938884-368831000","line":2364,"new":{"module_name":"integration__integration_tests__merge","snapshot_name":"merge_no_commit_no_squash_no_remove_redundant","metadata":{"source":"tests/integration_tests/merge.rs","assertion_line":2364,"info":{"program":"wt","args":["merge","main","--no-commit","--no-squash","--no-remove"],"env":{"CLICOLOR_FORCE":"1","COLUMNS":"150","GIT_AUTHOR_DATE":"2025-01-01T00:00:00Z","GIT_COMMITTER_DATE":"2025-01-01T00:00:00Z","GIT_CONFIG_GLOBAL":"[TEST_GIT_CONFIG]","GIT_CONFIG_SYSTEM":"/dev/null","GIT_EDITOR":"","LANG":"C","LC_ALL":"C","SOURCE_DATE_EPOCH":"1761609600","WORKTRUNK_CONFIG_PATH":"[TEST_CONFIG]"}}},"snapshot":"success: true\nexit_code: 0\n----- stdout -----\nπ \u001b[36mMerging 1 commit to \u001b[1m\u001b[36mmain\u001b[0m\u001b[36m @ \u001b[2m[SHA]\u001b[0m (no commit/squash/rebase needed)\n\u001b[107m \u001b[0m * [SHA]\u001b[33m (\u001b[m\u001b[1;36mHEAD\u001b[m\u001b[33m -> \u001b[m\u001b[1;32mfeature\u001b[m\u001b[33m)\u001b[m Add feature file\n\n\u001b[107m \u001b[0m feature.txt | 1 \u001b[32m+\u001b[m\n\u001b[107m \u001b[0m 1 file changed, 1 insertion(+)\n\nβ \u001b[32mMerged to \u001b[1m\u001b[32mmain\u001b[0m\u001b[0m (1 commit, 1 file, \u001b[32m+1\u001b[0m)\nβ \u001b[32mWorktree preserved (--no-remove)\u001b[0m\n\n----- stderr -----"},"old":{"module_name":"integration__integration_tests__merge","metadata":{},"snapshot":"success: true\nexit_code: 0\n----- stdout -----\nπ \u001b[36mMerging 1 commit to \u001b[1m\u001b[36mmain\u001b[0m\u001b[36m @ \u001b[2m[SHA]\u001b[0m (no commit/squash/rebase needed)\n\u001b[107m \u001b[0m * [SHA]\u001b[33m (\u001b[m\u001b[1;36mHEAD\u001b[m\u001b[33m -> \u001b[m\u001b[1;32mfeature\u001b[m\u001b[33m)\u001b[m Add feature file\n\u001b[107m \u001b[0m feature.txt | 1 \u001b[32m+\u001b[m\n\u001b[107m \u001b[0m 1 file changed, 1 insertion(+)\nβ \u001b[32mMerged to \u001b[1m\u001b[32mmain\u001b[0m\u001b[0m (1 commit, 1 file, \u001b[32m+1\u001b[0m)\nβ \u001b[32mWorktree preserved (--no-remove)\u001b[0m\n\n----- stderr -----"}}-{"run_id":"1763938990-684614000","line":2309,"new":null,"old":null}-{"run_id":"1763938990-684614000","line":2364,"new":null,"old":null}-{"run_id":"1763938990-684614000","line":2260,"new":null,"old":null}-{"run_id":"1763939190-448861000","line":2309,"new":null,"old":null}-{"run_id":"1763939190-448861000","line":2364,"new":null,"old":null}-{"run_id":"1763939190-448861000","line":2260,"new":null,"old":null}-{"run_id":"1763939283-599995000","line":2309,"new":null,"old":null}-{"run_id":"1763939283-599995000","line":2364,"new":null,"old":null}-{"run_id":"1763939283-599995000","line":2260,"new":null,"old":null}