From 897d01a330d658fcdcef44eed8b26caa21b8d16e Mon Sep 17 00:00:00 2001 From: root Date: Mon, 10 Dec 2018 16:40:59 +0000 Subject: [PATCH] Removed old image, replaced with new Signed-off-by: root --- docs/guides/github/contributing.md | 6 +----- docs/images/github-commit-bots.png | Bin 7268 -> 0 bytes 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 docs/images/github-commit-bots.png diff --git a/docs/guides/github/contributing.md b/docs/guides/github/contributing.md index 46d2c0a..e3ca83e 100644 --- a/docs/guides/github/contributing.md +++ b/docs/guides/github/contributing.md @@ -19,14 +19,10 @@ Contributors *sign-off* that they adhere to these requirements by adding a Signe The Pi-hole project uses a DCO bot for all GitHub pulls to verify that each commit is signed off. When you create your pull request, it will automaticaly be verified by this bot. An example of what to expect is below. -![Screenshot](../../images/github-commit-bots.png) +![Screenshot](../../images/github-commit-bots-expanded.png) If your Pull Request fails the DCO check, it's necessary to fix the entire commit history in the PR. Although this is a situation we'd like to avoid the best practice is to squash the commit history to a single commit, append the DCO sign-off as described above or interactively in the rebase comment editing process, and force push. For example, if you have 2 commits in your history (Note the ~2): -An example of the correct bot response is below. - -![Screenshot](../../images/github-commit-bots-expanded.png) - ```bash git rebase --interactive HEAD~2 (interactive squash + DCO append) diff --git a/docs/images/github-commit-bots.png b/docs/images/github-commit-bots.png deleted file mode 100644 index 96242cc1f9f7d3f051ddfcfefcebb3503604b7cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7268 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 CbQ_ES