Git遇到的一点错误

2

3

4

5

6

7

8

9

10

11

12

13

14

15

16

17

18

$ git remote add origin https://github.com/crifan/crifanLib.git

[email protected] /cygdrive/e/dev_root/git/crifanLib

$ git remote -v

origin  https://github.com/crifan/crifanLib.git (fetch)

origin  https://github.com/crifan/crifanLib.git (push)

[email protected] /cygdrive/e/dev_root/git/crifanLib

$ git push origin master

Username for ‘https://github.com‘:

Password for ‘https://[email protected]@github.com‘:

To https://github.com/crifan/crifanLib.git

 ! [rejected]        master -> master (non-fast-forward)

error: failed to push some refs to ‘https://github.com/crifan/crifanLib.git‘

To prevent you from losing history, non-fast-forward updates were rejected

Merge the remote changes (e.g. ‘git pull‘) before pushing again.  See the

‘Note about fast-forwards‘ section of ‘git push --help‘ for details.

2

3

4

5

6

7

8

9

10

11

12

13

14

15

16

17

18

19

20

21

22

23

24

25

26

$ git pull

warning: no common commits

remote: Counting objects: 6, done.

remote: Total 6 (delta 0), reused 0 (delta 0)

Unpacking objects: 100% (6/6), done.

From https://github.com/crifan/crifanLib

 * [new branch]      master     -> origin/master

You asked me to pull without telling me which branch you

want to merge with, and ‘branch.master.merge‘ in

your configuration file does not tell me, either. Please

specify which branch you want to use on the command line and

try again (e.g. ‘git pull <repository> <refspec>‘).

See git-pull(1) for details.

If you often merge with the same branch, you may want to

use something like the following in your configuration file:

    [branch "master"]

    remote = <nickname>

    merge = <remote-ref>

    [remote "<nickname>"]

    url = <url>

    fetch = <refspec>

See git-config(1) for details.

2

3

4

5

$ git pull origin

You asked to pull from the remote ‘origin‘, but did not specify

a branch. Because this is not the default configured remote

for your current branch, you must specify a branch on the command line.

2

3

4

5

6

$ git pull --rebase origin master

From https://github.com/crifan/crifanLib

 * branch            master     -> FETCH_HEAD

First, rewinding head to replay your work on top of it...

Applying: add local crifanLib to github

2

3

4

5

6

7

8

9

10

11

$ git push origin master

Username for ‘https://github.com‘:

Password for ‘https://[email protected]‘:

Counting objects: 19, done.

Delta compression using up to 4 threads.

Compressing objects: 100% (14/14), done.

Writing objects: 100% (18/18), 112.33 KiB, done.

Total 18 (delta 0), reused 0 (delta 0)

To https://github.com/crifan/crifanLib.git

   6bae951..32d67c7  master -> master