I am not sure how I pull the changes again from Int again
You A should have everything it needs from Int
.
If you need B
to get those changes from Int
(delivered "from a different child stream"), you can also rebase B
, like you did A
.
If the issue is:
- changes exist in
Int
A
doesn't reflect those changes after rebase
Then display a version tree of the parent folder of those changes (both in the source and in the destination view): you might see some clue as to why the versions of the elements in that folder wasn't merged.
For instance, check that parent folder doesn't have an evil twin in both branches.
If that were the case, you would need to restore the proper content of that folder in Int, before rebasing again A
(and even B
).
If the issue is:
- changes exist in
Int
B
doesn't reflect those changes after rebase- You cannot rebase from
Int
toB
You need to:
- make a dummy change on
Int
- put a new baseline on
Int
- rebase that baseline on
B