I am consolidating several parallel repository worktrees into one mainline. The release branch already contains verified application, documentation, and release changes, while a separate task has just completed. I need to compare branch ancestry and diffs, preserve unrelated work, resolve any overlapping changes, and only then run the minimum final validation and cleanup.