$ git pull --rebase gitee master From https://gitee.com/wuyujitang/deom-git* branch master -> FETCH_HEAD error: could not apply b0e1db8... 使用idea第一次提交 Resolve all conflicts manually, mark them as resolved with "git add/rm ", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b0e1db8... 使用idea第一次提交 CONFLICT (add/add): Merge conflict in .gitignore Auto-merging .gitignore
remote: Enumerating objects: 6, done. remote: Counting objects: 100% (6/6), done. remote: Compressing objects: 100% (6/6), done. remote: Total 6(delta 0), reused 0(delta 0), pack-reused 0 Unpacking objects: 100% (6/6), 5.26 KiB |244.00 KiB/s, done. From https://gitee.com/wuyujitang/test-git-1* branch master -> FETCH_HEAD* [new branch] master -> gitee/master error: The following untracked working tree files would be overwritten by checkout:.gitignore Please move or remove them before you switch branches. Aborting error: could not detach HEAD