04-git-解决冲突与异常

简介: 04-git-解决冲突与异常

冲突

   冲突原因

  • 当本地仓库与远程仓库代码不一致时,push代码会出现冲突,如下图

   解决冲突

  • pull 远程仓库代码:git pull origin dev

  • 找到冲突文件手动合并

   

  • 添加到暂存区:git add <文件名>

  • 添加到本地仓库:git commit  -m "日志信息"

  • 提交到远程仓库:git push origin dev

 

异常

     异常1:git push时选取的本地分支进行推送,如果推送的分支在本地分支中不存在

  • 异常:error: src refspec dev does not match any
  • 解决:创建一个对应的dev branch:git checkout -b dev

    异常2:本地仓库代码想推送到新的远程仓库,远程仓库中有文件,推送失败

 

    解决:  

  • pull远程仓库代码:git  pull origin dev  --allow-unrelated-histories
  • 合并冲突文件并添加到本地仓库:git commit -m "日志信息"
  • 提交远程仓库:git  push origin dev

添加忽略文件不生效

  • git rm -r --cached 忽略的文件
git rm -r --cached .idea


相关文章
|
编译器 开发工具 git
【Git异常】You are in ‘detached HEAD‘ state, which means that you‘re not on any branch Checkout a branch
【Git异常】You are in ‘detached HEAD‘ state, which means that you‘re not on any branch Checkout a branch
327 0
|
6月前
|
网络安全 开发工具 数据安全/隐私保护
Win10使用Git克隆项目出现fatal: Authentication failed for异常
Windows 10系统中使用Git克隆项目时出现"fatal: Authentication failed for"异常的解决方法,主要是通过修改凭据管理器中的Git凭据密码来解决因密码过期导致的身份验证失败问题。
147 0
Win10使用Git克隆项目出现fatal: Authentication failed for异常
|
9月前
|
网络安全 开发工具 git
git修改提交路径以及强制提交——异常:error: remote origin already exists.与异常:error: failed to push some refs to的解决
git修改提交路径以及强制提交——异常:error: remote origin already exists.与异常:error: failed to push some refs to的解决
125 0
|
Ubuntu Linux 开发工具
idea使用git提交代码报异常refusing to merge unrelated histories和unknown option `allow-unrelated-histories‘
idea使用git提交代码报异常refusing to merge unrelated histories和unknown option `allow-unrelated-histories‘
|
运维 Shell 开发工具
【Git异常】Push master to origin/master was rejected by remote
【Git异常】Push master to origin/master was rejected by remote
407 0
|
开发工具 git
git异常:fatal: 'idea-line-2' is not a commit and a branch 'idea-line-2' cannot be created from it
git异常:fatal: 'idea-line-2' is not a commit and a branch 'idea-line-2' cannot be created from it
1276 0
|
23天前
|
网络安全 开发工具 git
mac git clone命令提示git@gitee.com: Permission denied (publickey).问题修复
mac git clone命令拉取gitee上项目代码时提示密钥问题

相关实验场景

更多