Question

IFS Cloud 22R1 : How to combine two branches and make one topic environment?

  • 15 July 2022
  • 1 reply
  • 56 views
KRBLPL
Rank
Userlevel 1
Badge +2

Do you know how to combine two branches and make one topic environment?

I have a situation where an attempt to create an topic environment for Branch1 (CRIM1) ends with an installation error, due to a missing column in one of the tables.

This column is added in Branch2 (CRIM2), but an attempt to create an topic environment for Branch2 (CRIM2) results in a DB generation error, because it does not find a file that is in Branch1 (CRIM1).

So we have a deadlock.

From what I have already learned, I can combine two branches into additional one (third branch) and only then create a topic environment.
Unfortunately, I don't know how to do this.

Could someone describe step by step how to do? Should this extra (third) branch later be merged to Master?

Thank you in advance 8-)

1 reply

W
Rank
Userlevel 3
Badge +8

yes you can create  a third branch from master. the merge the two branches to this(git merge <branch name>) and create a topic environment.  after testing, merge the third branch to master , ignore other two branches.

Reply


Terms & ConditionsCookie settings