Adding folders to a github repo

1

Hi i download Git and tried to follow some instructions but i am now confused about what to do. I want to add some folders into a github repo. I want to upload api and client onto the repo.

I created a repo( i deleted the readme)
I then tried to add the folders but it did not work. see the error messages below

image
image1366×768 78.2 KB

the .git is saved in streams_issue

Help would be so appreciated! thanks

 create mode 100644 client/src/reducers/authReducer.js
 create mode 100644 client/src/reducers/index.js
 create mode 100644 client/src/reducers/streamReducer.js
 create mode 160000 streams_issue

C:\Users\Yaz\react projects\streams>git remote add origin https://github.com/SilvercutYaz/git_streams_issue.git

C:\Users\Yaz\react projects\streams>git push -u origin master
To https://github.com/SilvercutYaz/git_streams_issue.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'https://github.com/SilvercutYaz/git_streams_issue.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

C:\Users\Yaz\react projects\streams>git push -u origin master
To https://github.com/SilvercutYaz/git_streams_issue.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'https://github.com/SilvercutYaz/git_streams_issue.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

C:\Users\Yaz\react projects\streams>git pull
warning: no common commits
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 5 (delta 0), reused 3 (delta 0), pack-reused 0
Unpacking objects: 100% (5/5), done.
From https://github.com/SilvercutYaz/git_streams_issue
 * [new branch]      master     -> origin/master
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=origin/<branch> master


C:\Users\Yaz\react projects\streams>git push -u origin master
To https://github.com/SilvercutYaz/git_streams_issue.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/SilvercutYaz/git_streams_issue.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

C:\Users\Yaz\react projects\streams>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=origin/<branch> master


C:\Users\Yaz\react projects\streams>git push -u origin master
To https://github.com/SilvercutYaz/git_streams_issue.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/SilvercutYaz/git_streams_issue.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

C:\Users\Yaz\react projects\streams>git pull <master>
The syntax of the command is incorrect.

C:\Users\Yaz\react projects\streams>git pull master
fatal: 'master' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

C:\Users\Yaz\react projects\streams>
2

i read that i should pull it but this still does not seem to have worked

C:\Users\Yaz\react projects\streams>git pull origin master
From https://github.com/SilvercutYaz/git_streams_issue
 * branch            master     -> FETCH_HEAD
fatal: refusing to merge unrelated histories
4

open git bash in the root project directory and run

git pull origin master

then run this

git push origin master
5

the following error:

Yaz@DESKTOP-AKKTT MINW32 ~/streams (master)
$ git pull origin master
fatal: 'origin' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

i want to put api and client into the repo. and i have the git files in the streams folder.

image
image1366×768 80.9 KB

6

hi, so i am getting there but still stuck at the final point.

  1. origin now reset
  2. cannot push
  3. in my remote repository there are no documents. i dont want to pull because won’t it delete the the local folders?
  4. i accidentally rebased and then did a hard-reset. but now its in the middle of rebasing. but i’m not sure what to do here
To https://github.com/SilvercutYaz/git_streams_issue.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/SilvercutYaz/git_streams_issue.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Yaz@DESKTOP-AKKTJUT MINGW32 ~/react projects/streams ((be53009...)|REBASE 1/1)
$

Yaz@DESKTOP-AKKTJUT MINGW32 ~/react projects/streams ((be53009...)|REBASE 1/1)
$ ^C

Yaz@DESKTOP-AKKTJUT MINGW32 ~/react projects/streams ((be53009...)|REBASE 1/1)
$