Jump to content

Search the Community

Showing results for tags 'head'.

  • Search By Tags

    Type tags separated by commas.
  • Search By Author

Content Type


Forums

  • Plastic SCM
    • General
    • Installation and configuration
    • Unity 3D
    • Plastic SCM on Mac
    • Plastic SCM on Linux
    • Gluon
    • Git interop
    • Integrations
    • Community Edition
    • Branching and merging
    • Announcements
  • Plastic SCM 4.0 Beta (Closed)
  • Plastic Cloud
    • General
    • Configuration
  • SemanticMerge
    • General
    • License
    • SCM's configuration
    • Share your experience!
    • External Parsers
  • GitJungle
  • Method History for Subversion
  • PlasticX Early Adopter Program's General Feedback
  • PlasticX Early Adopter Program's Issue Reporting
  • PlasticX Early Adopter Program's Feature Requests
  • PlasticX Early Adopter Program's Announcements

Find results in...

Find results that contain...


Date Created

  • Start

    End


Last Updated

  • Start

    End


Filter by number of...

Joined

  • Start

    End


Group


AIM


MSN


Website URL


ICQ


Yahoo


Jabber


Skype


Location


Interests

Found 2 results

  1. I created my repository a few hours ago and I'm trying to sync it from local to cloud for the first time (I'm using distributed version control). When I first tried to push the outgoing changes, the Sync failed because I had to first pull the incoming changes. So I successfully did that, and then I tried pushing again. This time, however, the branch replication failed because "The source branch has two heads", and I should "Merge from cs:af2f3159... [name continues] to br:/main to unify the heads". The problem is that I can't seem to find this "cs:af2f3159" etc. head anywhere to merge it with br:/main. I already tried to merge changesets both from the Changesets screen and from the Branch Explorer, but I'm always told that "The merge search has finished; merge destination already contains source changes", with no conflicts to solve or changes to apply. This is how my my Branch Explorer looks like: Any help would be appreciated.
  2. I am attempting to sync an on-prem PlasticSCM server with a Plastic Cloud account using the sync view functionality. One of the repos gives me the following error message when I attempt the sync: An error occurred during the replication: The source branch has two heads. Merge from cs:xxxxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx to br:/main to unify the heads. I know from some research (here in these forums and Stack Overflow) that this is an issue where there are two HEADs in the repo, and that I need to merge one into the other in order for this to get fixed, but I am unsure how to identify the offending changeset. Playing around with the Linux app, I believe that the `cs:xxxxxxx-...` is the GUID of the changeset I care about, but I am unsure if this is the case. Am I correct in that assumption? A second question, which is not terribly important (mostly curious), is what `cm` command(s) would be able to help me identify the second HEAD?
×
×
  • Create New...