diff --git a/attached_assets/Pasted--workspace-ls-American-Identity-Project-replit-nix-work_1776716600971.txt b/attached_assets/Pasted--workspace-ls-American-Identity-Project-replit-nix-work_1776716600971.txt new file mode 100644 index 0000000..c0c4084 --- /dev/null +++ b/attached_assets/Pasted--workspace-ls-American-Identity-Project-replit-nix-work_1776716600971.txt @@ -0,0 +1,70 @@ +~/workspace$ ls +American-Identity-Project replit.nix +~/workspace$ mkdir Chess +~/workspace$ ls +American-Identity-Project Chess replit.nix +~/workspace$ cd Chess/ +~/workspace/Chess$ git remote add origin https://git.keshavanand.net/CT/Chess.git +error: remote origin already exists. +~/workspace/Chess$ git -v +git version 2.50.1 +~/workspace/Chess$ git remote -v +gitsafe-backup git://gitsafe:5418/backup.git (fetch) +gitsafe-backup git://gitsafe:5418/backup.git (push) +origin https://git.keshavanand.net/CT/American-Identity-Project (fetch) +origin https://git.keshavanand.net/CT/American-Identity-Project (push) +~/workspace/Chess$ git remote remove origin +~/workspace/Chess$ git remote add origin https://git.keshavanand.net/CT/Chess.git +~/workspace/Chess$ git remote -v +gitsafe-backup git://gitsafe:5418/backup.git (fetch) +gitsafe-backup git://gitsafe:5418/backup.git (push) +origin https://git.keshavanand.net/CT/Chess.git (fetch) +origin https://git.keshavanand.net/CT/Chess.git (push) +~/workspace/Chess$ git pull +remote: Enumerating objects: 6, done. +remote: Counting objects: 100% (6/6), done. +remote: Compressing objects: 100% (6/6), done. +remote: Total 6 (delta 0), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (6/6), 1.66 KiB | 1.66 MiB/s, done. +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 + +If you wish to set tracking information for this branch you can do so with: + + git branch --set-upstream-to=/ main + +~/workspace/Chess$ ls +~/workspace/Chess$ ls +~/workspace/Chess$ ls -ls +total 0 +~/workspace/Chess$ ls -la +total 0 +drwxr-xr-x 1 runner runner 0 Apr 20 20:21 . +drwxr-xr-x 1 runner runner 154 Apr 20 20:21 .. +~/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. +~/workspace/Chess$ git remote -v +gitsafe-backup git://gitsafe:5418/backup.git (fetch) +gitsafe-backup git://gitsafe:5418/backup.git (push) +origin https://git.keshavanand.net/CT/Chess.git (fetch) +origin https://git.keshavanand.net/CT/Chess.git (push) +~/workspace/Chess$ \ No newline at end of file