Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[软技能] 第2080天 什么时候合并分支用git rebase, 不用 git merge？ #6049

Open
haizhilin2013 opened this issue Dec 24, 2024 · 1 comment
Open

[软技能] 第2080天 什么时候合并分支用git rebase, 不用 git merge？ #6049

haizhilin2013 opened this issue Dec 24, 2024 · 1 comment
Labels
软技能 软技能

Comments

@haizhilin2013
Copy link
Collaborator

第2080天 什么时候合并分支用git rebase, 不用 git merge？

3+1官网

我也要出题
@haizhilin2013 haizhilin2013 added the 软技能 软技能 label Dec 24, 2024
@lxfljw
Copy link

lxfljw commented Jan 5, 2025

  1. 本地分支 feat 合并 master 的分支用 rebase，这样可以保证本地分支的 commit 记录整洁
  2. 远程分支如何避免多余 commit？使用 git merge --ff-only 快进式合并，不会留下多余 commit

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
软技能 软技能
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@haizhilin2013 @lxfljw