Jump to content

Git branching created multiple heads


JadedDraconevix

Recommended Posts

When I imported my project from Git to Plastic, branches that were merged and deleted between multiple open branches created multiple heads laying around. Here's an example of one:
history.thumb.png.72c24cbe2c5a30d1058376962513e19a.png

So even though the head on the bottom gets merged back into /main through /intro-animation, if I only pull /main to local and try to push back to the cloud, it complains about having multiple heads, because without pulling /intro-animation too, it doesn't know that the head does actually get merged later. I can't really merge that head onto the end of /main because this is from a long time ago and the files it's referring to have been moved or changed or deleted. What are my options to fix /main?

Link to comment
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now
×
×
  • Create New...