Co-authored-by: Noah Lev <camelidcamel@gmail.com>
This commit is contained in:
Joshua Nelson 2022-12-31 17:51:12 -06:00
parent 97641d5eef
commit ee2c4f3e27

View file

@ -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: