简体繁体中英

Alternative to git rebase on public branches

原文 2017-02-22 11:22:54 7 1 git/ git-rebase

I have read that a public branch should never be rebased. If that's not the case, what else should be done with it? Does it have to be merged each time and then recreated?

1 answers

It's very nice to uplift a public branch by merging it with whatever branch it's tracking. This of course gives you merge commits on the branch but it makes it very clear in the branch history when it was uplifted and what was added in between the uplifts.

It also works very well with gerrit if you're using that. A trivial uplift gives you an empty review window in gerrit.

Use of git rebase in public feature branches

Git rebase, public remote branches and backing up a work in progress

Git rebase and children branches

Git rebase with conflicting branches

Git and management rebase of branches

git rebase workflow with branches

Git rebase recursive branches

Alternative to git rebase

Git rebase public branch

Git Rebase If No One Shares Branches

暂无

The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.

Related Question Use of git rebase in public feature branches Git rebase, public remote branches and backing up a work in progress Git rebase and children branches Git rebase with conflicting branches Git and management rebase of branches git rebase workflow with branches Git rebase recursive branches Alternative to git rebase Git rebase public branch Git Rebase If No One Shares Branches

Related Tags

Alternative to git rebase on public branches

Question

1 answers

solution1 0 2017-02-22 11:35:00

solution1
0 2017-02-22 11:35:00