gitee更新代码库

1、之前在gitee控制面板中直接更新了文件，导致了文件与本地的文件有区别

git pull

error: You have not concluded your merge (MERGE_HEAD exists).

hint: Please, commit your changes before merging.

fatal: Exiting because of unfinished merge.

2、到根目录中，执行

?

1

git add .

3、git commit 要跟上-a

git commit -a -m "测试" 

4、再次执行

git pull

hint: Pulling without specifying how to reconcile divergent branches is

hint: discouraged. You can squelch this message by running one of the following

hint: commands sometime before your next pull:

hint: 

hint:   git config pull.rebase false  # merge (the default strategy)

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.

Already up to date.

 

5、git push origin master 提交到代码库中

git push origin master 

 

Enumerating objects: 86, done.

Counting objects: 100% (73/73), done.

Delta compression using up to 8 threads

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

Writing objects: 100% (46/46), 12.09 KiB | 2.01 MiB/s, done.

Total 46 (delta 8), reused 0 (delta 0), pack-reused 0

remote: Powered by GITEE.COM [GNK-6.4]

To https://gitee.com/taiji85/flowable1-ui.git

   569d51c..a8499e3  master -> master