The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

ERROR RAMAS NO RELACIONADAS

Andres Perez
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
December 14, 2020

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

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

0 votes
Theodora Boudale
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
December 16, 2020

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

Andres Perez
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
December 16, 2020

Thank you very much I will be testing it

Like Theodora Boudale likes this
TAGS
AUG Leaders

Atlassian Community Events