Hi.
We are syncing a Plastic repo with a BitBucket repo.
In BitBucket, user1 merged a changeset from branch A into the main branch, and then committed 4 more changesets into main. User2 then created a new changeset in BItBucket on branch A, using the latest changeset on main as the parent. At least, that is how it appears to have synced across, as you can see from the attached image (the topmost branch is branch A, and the bottom one is main).
This has left multiple heads in branch A, and I can't figure out how to merge it in Plastic so that I can sync new changesets I have back to git.
Can anyone give me any suggestions?
Thanks.
Stephen
