Skip to content

Commit bd135ba

Browse files
authored
Update README.md
1 parent 4672706 commit bd135ba

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,9 @@ The CLI now automatically detects repository information from your git environme
215215
- **Committer information**: Git commit author details
216216
- **Default branch status**: Determined from git repository and CI environment
217217
- **Changed files**: Files modified in the current commit (for differential scanning)
218-
218+
> **Note on merge commits**:
219+
> Standard merges (two parents) are supported.
220+
> For *octopus merges* (three or more parents), Git only reports changes relative to the first parent. This can lead to incomplete or empty file lists if changes only exist relative to other parents. In these cases, differential scanning may be skipped. To ensure coverage, use `--ignore-commit-files` to force a full scan or specify files explicitly with `--files`.
219221
### Default Branch Detection
220222
221223
The CLI uses intelligent default branch detection with the following priority:
@@ -400,6 +402,11 @@ The manifest archive feature is useful for:
400402
401403
> **Note**: The tar.gz archive preserves the original directory structure, making it easy to extract and examine the files in their proper context.
402404
405+
### Differential scan skipped on octopus merge
406+
407+
When your repo uses an **octopus merge** (3+ parents), the CLI may not detect all changed files.
408+
This is expected Git behavior: the default diff only compares the merge result to the first parent.
409+
403410
## Development
404411
405412
This project uses `pyproject.toml` as the primary dependency specification.

0 commit comments

Comments
 (0)