You're almost there! Please answer a few more questions for access to the Applications content. Complete registration
Interested in joining? Complete your registration by providing Areas of Interest here. Register
Skip to content
  • Register
    • Learn about the new Oracle AI Agent Studio for Fusion Applications: Watch Now

    Progress with Redwood: Redwood Resources for Oracle Cloud HCM -  Go Here
    To ensure that questions get required attention from community members and are NOT left unanswered, it’s important for the author to indicate (by selecting “Yes” or “No” when prompted) whether the question was answered. (newly added) Please note that it is also important to respond to EACH comment your question receives. Your Yes or No response ensures an accurate status for your question.

    For more information, please refer to this announcement explaining best practices for getting answers to questions.

    VB-extension.json conflicts - how can we prevent them?

    in Visual Builder Studio for HCM 6 comments

    Summary:

    We have two different developer teams working in different modules, on different branches, in the same project, both of hcm.extension, but we keep getting conflicts when we merge to the same branch for deployments.

    We keep getting VB-extension.json conflicts and I'd like to understand these better to see what we can do to prevent them.

    Content (please ensure you mask any confidential information):

    I'm hesitant to resolve the conflict by accepting one over the other because I've noticed they merge all of the changes back down to the other branches. We want to keep their code separate because one team is ahead in timelines than the other, so when we merge to deploy to other environments we don't want both of the changes to go at the same time.

    Tagged:

    Howdy, Stranger!

    Log In

    To view full details, sign in.

    Register

    Don't have an account? Click here to get started!