From b3e2a6e6c8a3aae5b5d950c63046f23bae07096d Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Sat, 31 Dec 2022 17:51:12 -0600 Subject: [PATCH] fix typo Co-authored-by: Noah Lev --- src/git.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/git.md b/src/git.md index d79c07ed0fdd9..dfcf49656ff5f 100644 --- a/src/git.md +++ b/src/git.md @@ -140,7 +140,7 @@ You might also notice conflicts in the web UI: The most common cause is that you rebased after a change and ran `git add .` without first running `x.py` to update the submodules. Alternatively, you might have run `cargo fmt` instead of `x fmt` -and modified files in a submodule, then commited the changes. +and modified files in a submodule, then committed the changes. To fix it, do the following things: