Sign Up

Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.

Have an account? Sign In

Have an account? Sign In Now

Sign In

Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.

Sign Up Here

Forgot Password?

Don't have account, Sign Up Here

Forgot Password

Lost your password? Please enter your email address. You will receive a link and will create a new password via email.

Have an account? Sign In Now

You must login to ask a question.

Forgot Password?

Need An Account, Sign Up Here

Please briefly explain why you feel this question should be reported.

Please briefly explain why you feel this answer should be reported.

Please briefly explain why you feel this user should be reported.

Sign InSign Up

The Archive Base

The Archive Base Logo The Archive Base Logo

The Archive Base Navigation

  • SEARCH
  • Home
  • About Us
  • Blog
  • Contact Us
Search
Ask A Question

Mobile menu

Close
Ask a Question
  • Home
  • Add group
  • Groups page
  • Feed
  • User Profile
  • Communities
  • Questions
    • New Questions
    • Trending Questions
    • Must read Questions
    • Hot Questions
  • Polls
  • Tags
  • Badges
  • Buy Points
  • Users
  • Help
  • Buy Theme
  • SEARCH
Home/ Questions/Q 4254858
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Editorial Team
Asked: May 21, 20262026-05-21T05:08:25+00:00 2026-05-21T05:08:25+00:00

Currently we are merging two branches and are having a lot of issues when

  • 0

Currently we are merging two branches and are having a lot of issues when it comes to the Schema/DataSets. A large part of the problem comes from the auto-generated code being moved around.

I’m curious if anyone has encountered this problem, and what solutions or tools they used to solve it.

  • 1 1 Answer
  • 0 Views
  • 0 Followers
  • 0
Share
  • Facebook
  • Report

Leave an answer
Cancel reply

You must login to add an answer.

Forgot Password?

Need An Account, Sign Up Here

1 Answer

  • Voted
  • Oldest
  • Recent
  • Random
  1. Editorial Team
    Editorial Team
    2026-05-21T05:08:25+00:00Added an answer on May 21, 2026 at 5:08 am

    If the issue is strictly with generated code, I usually don’t even try to merge the branches.

    I will accept one or the other and, once the rest of the code is merged, I will re-generate the code.

    • 0
    • Reply
    • Share
      Share
      • Share on Facebook
      • Share on Twitter
      • Share on LinkedIn
      • Share on WhatsApp
      • Report

Sidebar

Related Questions

I'm currently using TortoiseSVN to do a merge of two branches and I've found
I have two branches: master and bonbon Currently they are at the same point.
My question is this: If I have two heads (branches with changes) in my
I am coming from CVS background. Currently, I have 2 mercurial repositories developed parallel.
I am currently getting autocomplete results from a single source. If I wanted to
We regularly have lots of conflicts when merging the auto-generated xml files created by
I'm trying to combine code on two branches with the 'git merge' command, but
Here is the issue I am having: I have a large query that needs
We currently have 2 branches: /repo/branch/current_version /repo/branch/next_version current_version is a branch where all developers
I am currently building an Android app where I will have to maintain two

Explore

  • Home
  • Add group
  • Groups page
  • Communities
  • Questions
    • New Questions
    • Trending Questions
    • Must read Questions
    • Hot Questions
  • Polls
  • Tags
  • Badges
  • Users
  • Help
  • SEARCH

Footer

© 2021 The Archive Base. All Rights Reserved
With Love by The Archive Base

Insert/edit link

Enter the destination URL

Or link to existing content

    No search term specified. Showing recent items. Search or use up and down arrow keys to select an item.