How to list and delete branches

List branches

# list your local branches
$ git branch

# list your remote branches
$ git branch -r

# list both remote and local branches
$ git branch -a

See the last commit on each Branch

$ git branch -v

List merged or not merged branches

# list the branches that are already merged into the branch you're on
$ git branch --merged

# list the branches that contain work you haven't yet merged in
$ git branch --no-merged

Delete branches

# delete a local branch
$ git branch -d <<local_branch_name>>

# delete a remote branch
$ git push origin :<<remote_branch_name>>

If you have other branches that contain work that haven’t merged in yet, trying to delete it with git branch -d will fail.
But if you really do want to delete the branch and lose that work, you can force it with -D.

# force to delete an unmerged branch
$ git branch -D <<local_branch_name>>

Reference

Git Branching - Branch Management
How to list and delete branches

"Need to specify how to reconcile divergent branches"是git命令中的一个错误信息,意味着需要指定如何合并不同分支。 有几种方法可以解决这个问题: 1. 第一种解决方法是执行`git config pull.rebase false`命令,这将默认使用合并(merge)而不是变基(rebase)的方式将拉取(pull)下来的代码与现有改动的代码进行合并。但是这可能会导致代码冲突,需要处理这个冲突。如果两个人都对同一个文件进行了更改,需要与之前进行push操作的人联系,讨论如何解决这段代码的冲突。 此外,还可以养成一个良好的git发布流程的习惯,以下是一个分支合并发布的流程: 1. 使用`git add .`命令将所有新增、修改或删除的文件添加到暂存区。 2. 使用`git commit -m "版本发布"`命令将暂存区的文件提交(发版)。 3. 使用`git status`命令查看是否还有文件没有上传到远程仓库。 4. 使用`git checkout test`命令切换到要合并的目标分支。 5. 使用`git pull`命令在目标分支上拉取最新的代码,以避免冲突。 6. 使用`git merge dev`命令在目标分支上合并源分支(dev分支)上的代码。 7. 使用`git push`命令上传目标分支的代码到远程仓库。<span class="em">1</span><span class="em">2</span><span class="em">3</span> #### 引用[.reference_title] - *1* [解决git问题:fatal: Need to specify how to reconcile divergent branches.](https://blog.youkuaiyun.com/weixin_51220967/article/details/127870602)[target="_blank" data-report-click={"spm":"1018.2226.3001.9630","extra":{"utm_source":"vip_chatgpt_common_search_pc_result","utm_medium":"distribute.pc_search_result.none-task-cask-2~all~insert_cask~default-1-null.142^v93^chatsearchT3_2"}}] [.reference_item style="max-width: 50%"] - *2* *3* [【Git】pull 分支报错 fatal: Need to specify how to reconcile divergent branches...](https://blog.youkuaiyun.com/qq_45677671/article/details/122574671)[target="_blank" data-report-click={"spm":"1018.2226.3001.9630","extra":{"utm_source":"vip_chatgpt_common_search_pc_result","utm_medium":"distribute.pc_search_result.none-task-cask-2~all~insert_cask~default-1-null.142^v93^chatsearchT3_2"}}] [.reference_item style="max-width: 50%"] [ .reference_list ]
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值