git: help managing a composite of topic branches

Meson · 04-27-2012, 10:14 PM

I have a master branch a few topic branches. For each topic branch I actually keep two version. topicX and topicX-rebase. topicX merges from master whenever there is a new release. topicX-rebase is a continous rebase on top of master.

I'd like an "all" branch which contains all of the topic commits, on top of master, with not merges. How can I do this?

One thing that gives me what I want is to

Code:

$ git checkout -b all master
$ git merge topicA-rebase
$ git merge topicB-rebase
$ # resolve conflicts
$ git merge topic...
$ resolve conflicts...
$ git rebase master
$ # resolve conflicts AGAIN

This can get pretty tedious. I guess I don't mind fixing the conflicts once, but twice is a PITA. Any options here?

pan64 · 04-29-2012, 07:42 AM

would be better a graphical view of branches. Where are the commits made (on which branches)?

Meson · 04-30-2012, 07:07 PM

All of them. Someone suggested rerere, but this isn't really doing what I want. For example, if enable rerere, I can redo the merging phase, but it doesn't seem to detect the conflict resolutions on rebase.

pan64 · 05-01-2012, 09:27 AM

are you sure those conflicts are the same? I think there can be some conflicts in every step, so it is normal.