Merge
Bringing one branch's work into another. If only one side has moved, git simply slides the branch forward. If both have, it finds the commit they share, combines the two sets of changes, and makes a new commit with two parents.
Once several agents are working, the merge is where their work meets, and where two individually correct changes can stop being correct together. Merge a branch that has passed its checks, then run those checks again on the result.
Say it to your agent
“Merge feature/search into main with --no-ff so the branch stays visible in the history, then run bun test on the result before pushing. If anything conflicts, stop and show me.”