|
|
@@ -254,6 +254,25 @@ New-ItemProperty -Path "HKLM:\System\CurrentControlSet\Services\Lanmanworkstatio
|
|
|
|
|
|
## Troubleshooting
|
|
|
|
|
|
+### gclient sync complains about rebase
|
|
|
+
|
|
|
+If `gclient sync` is interrupted the git tree may be left in a bad state, leading to a cryptic message when running `gclient sync` in the future:
|
|
|
+
|
|
|
+```plaintext
|
|
|
+2> Conflict while rebasing this branch.
|
|
|
+2> Fix the conflict and run gclient again.
|
|
|
+2> See man git-rebase for details.
|
|
|
+```
|
|
|
+
|
|
|
+If there are no git conflicts or rebases in `src/electron`, you may need to abort a `git am` in `src`:
|
|
|
+
|
|
|
+```sh
|
|
|
+$ cd ../
|
|
|
+$ git am --abort
|
|
|
+$ cd electron
|
|
|
+$ gclient sync -f
|
|
|
+```
|
|
|
+
|
|
|
### I'm being asked for a username/password for chromium-internal.googlesource.com
|
|
|
If you see a prompt for `Username for 'https://chrome-internal.googlesource.com':` when running `gclient sync` on Windows, it's probably because the `DEPOT_TOOLS_WIN_TOOLCHAIN` environment variable is not set to 0. Open `Control Panel` → `System and Security` → `System` → `Advanced system settings` and add a system variable
|
|
|
`DEPOT_TOOLS_WIN_TOOLCHAIN` with value `0`. This tells `depot_tools` to use
|
David Sanders