search

ArchiveTeam / seesaw-kit

Making a reusable toolkit for writing seesaw scripts
Other
69 stars 30 forks source link

git pull warn about " how to reconcile divergent branches" #147

Open nsapa opened 10 months ago

nsapa commented 10 months ago 
2023-10-08 14:23:21,733 - seesaw.warrior - DEBUG - Select project urlteam2
2023-10-08 14:23:21,733 - seesaw.warrior - DEBUG - Start selected project urlteam2 (reinstall=False)
2023-10-08 14:23:21,734 - seesaw.warrior - DEBUG - Install project urlteam2
2023-10-08 14:23:21,895 - seesaw.warrior - DEBUG - git pull from https://github.com/ArchiveTeam/terroroftinytown-client-grab
2023-10-08 14:23:24,402 - seesaw.warrior - DEBUG - git operation: hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Already up to date.

2023-10-08 14:23:24,458 - seesaw.warrior - DEBUG - Project install file result: 0
2023-10-08 14:23:24,459 - seesaw.warrior - DEBUG - Install complete hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Already up to date.
No need to do anything, requests already installed! Continuing.

2023-10-08 14:23:24,460 - seesaw.warrior - DEBUG - Result of the install process: True
2023-10-08 14:23:24,461 - seesaw.warrior - DEBUG - Clone project urlteam2 /home/warrior/projects/urlteam2
2023-10-08 14:23:24,466 - seesaw.warrior - DEBUG - Cloning version b9421f4
2023-10-08 14:23:24,489 - seesaw.warrior - DEBUG - Load pipeline /home/warrior/data/projects/urlteam2-b9421f4/pipeline.py

Maybe doing git config pull.rebase false in seesaw/warrior.py Warrior.install_project() would silence this warning?