From 478db892c206eaf12a7634df486d2886304333c2 Mon Sep 17 00:00:00 2001 From: Jessica Janiuk Date: Wed, 21 Sep 2022 13:04:06 -0700 Subject: [PATCH] docs: Add new PR response templates (#47515) This adds new PR template responses for dealing with rebases and commit header changes. PR Close #47515 --- docs/SAVED_REPLIES.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/SAVED_REPLIES.md b/docs/SAVED_REPLIES.md index 5b247038bd5..5574c4b6259 100644 --- a/docs/SAVED_REPLIES.md +++ b/docs/SAVED_REPLIES.md @@ -71,3 +71,15 @@ Hello, we reviewed this issue and determined that it doesn't fall into the bug r If you are wondering why we don't resolve support issues via the issue tracker, please [check out this explanation](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#question). ``` + +## Angular: Commit Header +``` +It looks like you need to update your commit header to match our requirements. This is different from the PR title. To update the commit header, use the command `git commit --amend` and update the header there. + +Once you've finished that update, you will need to force push using `git push [origin name] [branch name] --force`. That should address this. +``` + +## Angular: Rebase and Squash +``` +Please rebase and squash your commits. To do this, make sure to `git fetch upstream` to get the latest changes from the angular repository. Then in your branch run `git rebase upstream/main -i` to do an interactive rebase. This should allow you to fixup or drop any unnecessary commits. After you finish the rebase, force push using `git push [origin name] [branch name] --force`. +```