表演后: git pull origin master
git pull origin master
我得到以下内容:
* branch master -> FETCH_HEAD error: The following untracked working tree files would be overwritten by merge: .gitignore Please move or remove them before you merge. Aborting
我怎么能继续?
输出告诉您有未提交的更改 .
您可以执行以下操作之一:
要 add & commit 您的更改:
add & commit
# Add and commit changes git add . && git commit -m"Message"
放弃更改:
# discard your changes git checkout -- .gitignore
1 回答
输出告诉您有未提交的更改 .
您可以执行以下操作之一:
要
add & commit
您的更改:放弃更改: