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

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

ERROR RAMAS NO RELACIONADAS

hola como estan espero puedan ayurdarme tengo un prooyecto el cual contiene dos ramas (master, develop) eh estado trabajando a e la rama develop el problema esta cuando intento fucionar mi rama develop con mi master me tira error:

No se puede fusionar

Ramas no relacionadas

y ya no se como solucinarlo. 

1 answer

Hi @Andres Perez and welcome to the community!

Based on a translation of your message, I understand that you get an error 'Unrelated branches'.

This occurs if you try to merge two branches that have no common commits.

If you still want to merge them, you'll need to use the flag --allow-unrelated-histories in the merge command:

git merge <branch-name> --allow-unrelated-histories

Kind regards,
Theodora

Thank you very much I will be testing it

Like Theodora Boudale likes this

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Bitbucket

New improvements to user management in Bitbucket Cloud 👥

Hey Community! We’re willing to wager that quite a few of you not only use Bitbucket, but administer it too. Our team is excited to share that we’ll be releasing improvements throughout this month of...

3,827 views 10 16
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you