3963a55ac6
Add a file containing git commands and error messages related to handling divergent branches and setting up upstream tracking for the Chess repository. Replit-Commit-Author: Agent Replit-Commit-Session-Id: f6819c21-e85d-45ac-acde-604db2cfa4fe Replit-Commit-Checkpoint-Type: full_checkpoint Replit-Commit-Event-Id: d9940c32-e4d8-453f-8adb-85033b26737e Replit-Helium-Checkpoint-Created: true
47 lines
2.0 KiB
Plaintext
47 lines
2.0 KiB
Plaintext
! [rejected] main -> main (non-fast-forward)
|
|
error: failed to push some refs to 'https://git.keshavanand.net/CT/Chess.git'
|
|
hint: Updates were rejected because the tip of your current branch is behind
|
|
hint: its remote counterpart. If you want to integrate the remote changes,
|
|
hint: use 'git pull' before pushing again.
|
|
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
|
|
~/.../Chess/Sprites$ git pull
|
|
From https://git.keshavanand.net/CT/Chess
|
|
* [new branch] main -> origin/main
|
|
There is no tracking information for the current branch.
|
|
Please specify which branch you want to merge with.
|
|
See git-pull(1) for details.
|
|
|
|
git pull <remote> <branch>
|
|
|
|
If you wish to set tracking information for this branch you can do so with:
|
|
|
|
git branch --set-upstream-to=<remote>/<branch> main
|
|
|
|
~/.../Chess/Sprites$ cd ..
|
|
~/workspace/Chess$ git pull
|
|
There is no tracking information for the current branch.
|
|
Please specify which branch you want to merge with.
|
|
See git-pull(1) for details.
|
|
|
|
git pull <remote> <branch>
|
|
|
|
If you wish to set tracking information for this branch you can do so with:
|
|
|
|
git branch --set-upstream-to=<remote>/<branch> main
|
|
|
|
~/workspace/Chess$ git pull origin main
|
|
From https://git.keshavanand.net/CT/Chess
|
|
* branch main -> FETCH_HEAD
|
|
hint: You have divergent branches and need to specify how to reconcile them.
|
|
hint: You can do so by running one of the following commands sometime before
|
|
hint: your next pull:
|
|
hint:
|
|
hint: git config pull.rebase false # merge
|
|
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.
|
|
fatal: Need to specify how to reconcile divergent branches. |