From d37ebef0c00f8838728ab05adee5ba4565bc5d97 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Fri, 1 Nov 2024 11:27:41 -0700 Subject: [PATCH] docs: Fix typos in new contintuing work guide. --- docs/contributing/continuing-unfinished-work.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/contributing/continuing-unfinished-work.md b/docs/contributing/continuing-unfinished-work.md index c4d92bde04..4fc291d3ae 100644 --- a/docs/contributing/continuing-unfinished-work.md +++ b/docs/contributing/continuing-unfinished-work.md @@ -67,10 +67,10 @@ When you use or build upon someone else's unmerged work, it is both professionally and ethically necessary to [properly credit][coauthor-git-guide] their contributions in the commit history of work that you submit. Git, used properly, does a good job of -preserving commits originally authorship information. +preserving the original authorship of commits. However, it's normal to find yourself making changes to commits -originally authored by others contributors, whether resolving merge +originally authored by other contributors, whether resolving merge conflicts when doing `git rebase` or fixing bugs to create an atomically correct commit compliant with Zulip's [commit guidelines](../contributing/commit-discipline.md).