Siebel Open UI, Tools, Scripting and EAI (MOSC)

MOSC Banner

Non-trivial merges - Rebase - Conflict Resolution

edited Nov 12, 2019 4:04AM in Siebel Open UI, Tools, Scripting and EAI (MOSC) 2 commentsAnswered

Hi,

We are upgrading to Ip19 and have few queries on the rebase due to conflict

1, If there are any conflicts then need to do rebase. Conflicts arises only when 2 developers are working on same object and anyone developer already pushed their changes to MAIN ?

2, Resolve Conflict button - Conflict will be automatically resolved ?

3, In a particular case on click of Rebase, I didn't noticed any conflict i.e., Merge Report didn't showed any conflict. In such case why WS delivery lead to rebase ?

4, Whenever rebase done. List of objects count in DWS increases. Example: WS1 have 4 object changes. When rebase is done, WS1 object count increases to 50+

Tagged:

Howdy, Stranger!

Log In

To view full details, sign in to My Oracle Support Community.

Register

Don't have a My Oracle Support Community account? Click here to get started.

Category Leaderboard

Top contributors this month

SBL Configuration-EAI Tags

Instructions for posting

×

1. Select a discussion category from the picklist.


2. Enter a title that clearly identifies the subject of your question.


3. In the body, insert detailed information, including Oracle product and version.


Please abide by the Oracle Community guidelines and refrain from posting any customer or personally identifiable information (PI/CI).


Cloud / Fusion customers - Our Cloud community has moved! Please go to Cloud Customer Connect .


New to My Oracle Support Community? Visit our Welcome Center

MOSC Help Center