github git add items to the library

1, in a new github repository.
2, cmd file into the project folder with
3, command git initthis folder becomes manageable Git repository
then inside more than a .git folder, which is used to track and manage Git repository. If you can not see because it is hidden by default files, then you need to set up to make hidden files visible.
4, the project included .git version control

git add .

5, all changes into the local staging area, waiting for upload.

git commit -m "此次上传的说明"

6, connecting remote repository

git remote add origin "https://github.com/GitHub用户名/代码仓库名称.git"

7, all from a remote repository pull updates (each project must upload operation)

git pull origin master

I reported here a mistake,

failed to push some refs to
'https://github.com/aopo1104/flutter_demo.git

In fact my local generated a readme, the library also has a readme, it had a conflict.

Here first library code pulled down to resolve the conflict

git pull --rebase origin master

Then open the readme file to see a conflict position
Here Insert Picture Description
here

<<<<HEAD

To

====

Is a library of code
below is the native code
we will

<<<<HEAD ===== >>>>>INIT

After deleted to make conflict that is resolved, call

git add .
git rebase --continue

If you rebase still in the state, will continue to resolve the conflict
does not directly push

 git push --set-upstream origin master
Published 57 original articles · won praise 3 · Views 6188

Guess you like

Origin blog.csdn.net/qq_39830579/article/details/103702952