Skip to content

Commit

Permalink
fix typo
Browse files Browse the repository at this point in the history
Co-authored-by: Noah Lev <camelidcamel@gmail.com>
  • Loading branch information
jyn514 and camelid committed Jan 1, 2023
1 parent 664346d commit b3e2a6e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/git.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down

0 comments on commit b3e2a6e

Please sign in to comment.