william@xubuntu-dtrain:~/Projects/FPGA/litex/litex$ python3 litex_setup.py --update
          __   _ __      _  __
         / /  (_) /____ | |/_/
        / /__/ / __/ -_)>  <
       /____/_/\__/\__/_/|_|
     Build your hardware, easily!
          LiteX Setup utility.

[   0.001] LiteX Setup auto-update...
[   5.548] LiteX Setup is obsolete, updating.
          __   _ __      _  __
         / /  (_) /____ | |/_/
        / /__/ / __/ -_)>  <
       /____/_/\__/\__/_/|_|
     Build your hardware, easily!
          LiteX Setup utility.

[   0.001] LiteX Setup auto-update...
[   0.490] LiteX Setup is up to date.
[   0.490] Updating Git repositories...
[   0.490] ----------------------------
[   0.557] Updating migen Git repository...
Already on 'master'
Your branch is up to date with 'origin/master'.
Already up to date.
[   2.635] Updating pythondata-software-picolibc Git repository...
Already on 'master'
Your branch is up to date with 'origin/master'.
remote: Enumerating objects: 45, done.
remote: Counting objects: 100% (45/45), done.
remote: Compressing objects: 100% (29/29), done.
remote: Total 42 (delta 18), reused 37 (delta 13), pack-reused 0
Unpacking objects: 100% (42/42), 7.83 KiB | 45.00 KiB/s, done.
From https://github.com/litex-hub/pythondata-software-picolibc
   a2aabaa..4a9b38f  master     -> origin/master
Fetching submodule pythondata_software_picolibc/data
From https://github.com/picolibc/picolibc
   1ebc8d53b..24fcbff24  debian          -> origin/debian
   cea193120..f3981f6c1  main            -> origin/main
 * [new branch]          no-c-args-props -> origin/no-c-args-props
 * [new branch]          zephyr          -> origin/zephyr
 * [new tag]             1.7.5           -> 1.7.5
 * [new tag]             1.7.5-1         -> 1.7.5-1
Updating a2aabaa..4a9b38f
Fast-forward
 pythondata_software_picolibc/__init__.py | 25 +++++++++++--------------
 pythondata_software_picolibc/data        |  2 +-
 2 files changed, 12 insertions(+), 15 deletions(-)
Submodule path 'pythondata_software_picolibc/data': checked out 'f3981f6c16a7b690f1697c9a7f986964bc2e386f'
[   8.209] Updating pythondata-software-compiler_rt Git repository...
Already on 'master'
Your branch is up to date with 'origin/master'.
Already up to date.
[   8.958] Updating litex Git repository...
M       litex_setup.py
Already on 'master'
Your branch is up to date with 'origin/master'.
remote: Enumerating objects: 637, done.
remote: Counting objects: 100% (517/517), done.
remote: Compressing objects: 100% (183/183), done.
remote: Total 637 (delta 422), reused 411 (delta 328), pack-reused 120
Receiving objects: 100% (637/637), 166.40 KiB | 760.00 KiB/s, done.
Resolving deltas: 100% (478/478), completed with 84 local objects.
From https://github.com/enjoy-digital/litex
   9d68a947..0bd2abf6  master     -> origin/master
 * [new branch]        setup_fix  -> origin/setup_fix
Updating 9d68a947..0bd2abf6
error: Your local changes to the following files would be overwritten by merge:
        litex_setup.py
Please commit your changes or stash them before you merge.
Aborting
Traceback (most recent call last):
  File "litex_setup.py", line 392, in <module>
    main()
  File "litex_setup.py", line 370, in main
    litex_setup_update_repos(config=args.config)
  File "litex_setup.py", line 206, in litex_setup_update_repos
    subprocess.check_call("git pull --ff-only", shell=True)
  File "/usr/lib/python3.8/subprocess.py", line 364, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command 'git pull --ff-only' returned non-zero exit status 1.
william@xubuntu-dtrain:~/Projects/FPGA/litex/litex$