Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Unrelated branches!!!!These branches have no common ancestor.

Vinayakam R K March 2, 2023

attempting to merge two branches, yet this cannot be taking place.

What ought to be the rationale?

1 answer

0 votes
Erez Maadani
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
March 3, 2023

Hey @Vinayakam R K

In order to do smart merges, git looks on previous commits to understand which changes to choose from each branch. Without a common ancestor, git won't have a starting point for the merge and won't be to update the commit tree correctly.

You can try solving this issue using git cherry-pick the selected commits or git show and git apply to apply the code changes without updating the commit tree.  

Suggest an answer

Log in or Sign up to answer
DEPLOYMENT TYPE
CLOUD
PERMISSIONS LEVEL
Site Admin
TAGS
AUG Leaders

Atlassian Community Events