Rebase vs. Merge

[Oscar]

Hi,

Figure 35 of the usage guide says "it is very likely a merge is needed after a rebase":

Questions:

1. "it is very likely" is vague, Could you list exactly all circumstances under which we need a merge after a rebase? What direction the merge here implies, parent-->child or child-->parent?

2. If merge is a must after rebase, why we need rebase first? How about directly merging from parent branch --> Child branch?

Thanks,

-Oscar

Figure35.bmp

[Arthur]

Hi' date='

Figure 35 of the usage guide says "it is very likely a merge is needed after a rebase":

Questions:

1. "it is very likely" is vague, Could you list exactly all circumstances under which we need a merge after a rebase? What direction the merge here implies, parent-->child or child-->parent?

2. If merge is a must after rebase, why we need rebase first? How about directly merging from parent branch --> Child branch?

Thanks,

-Oscar[/quote']

I have the same confusion. By the way, how can I post a image in this forum?

[psantosl]

Hi guys,

Well, very likely means:

- Suppose you start from cset:30 in br:/main

- You create br:/main/task0030 from cset:30

- You modify 30 files, one of them is foo.c

- You modify foo.c in br:/main too

- You rebase br:/main/task0030 to latest on br:/main -> you'll have to merge foo.c!!

Is "very likely" because under normal circumstances you won't be doing changes alone...