Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions git.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,22 @@ Merged branches MUST have no conflicts with the current master. If there are
any conflicts author is expected to fix them by rebasing and force-pushing the
branch.

### Agentic PRs

The requirement to use merge commits is relaxed for AI-generated branches and
PRs (Copilot). These tools can't structure changes properly and also can't
rebase changes, so their branches usually contain a lot of dirty commits with
bad descriptions. Since these tools are mostly used for small things and since
the changeset needs to be adjusted anyway the easiest way to handle these
PRs is to use squash&merge GitHub function, therefore it's explicitly allowed
for cases like this.

When merging such PRs make sure you have a good description for the resulting
commit:
* drop log URL references if the issue at hand, PR and all discussions are
public on GitHub anyway
* add "Co-authored-by:" line properly (with real name and e-mail, not GitHub
account and its magic automatic addresses) identifying the person driving
agent session
* ensure the original issue is mentioned
* add technical details from PR description as appropriate
Loading