Projects information

Chunk

Conflicting content
import java.util.UUID; <<<<<<< HEAD /** * Features should be able to represent a GVF (which is a more generic version of a VCF) * See http://genomebiology.com/2010/11/8/R88 * * We will want to tag features and version features, however we probably do not want * ACL features on a Feature level since there will be many many features * @author dyuen / public abstract class Feature implements Taggable, Versionable{ ======= public abstract class Feature implements Taggable { >>>>>>> f008466f2348366e29db04c6fe1c4b0fbbc6e94a /* * Strand locations of features.

Conflicting content

import java.util.UUID;

<<<<<<< HEAD
/**
 * Features should be able to represent a GVF (which is a more generic version of a VCF)
 * See http://genomebiology.com/2010/11/8/R88
 * 
 * We will want to tag features and version features, however we probably do not want 
 * ACL features on a Feature level since there will be many many features
 * @author dyuen
 */
public abstract class Feature implements Taggable, Versionable{
=======
public abstract class Feature implements Taggable {
>>>>>>> f008466f2348366e29db04c6fe1c4b0fbbc6e94a

    /**
     * Strand locations of features.

Solution content
import java.util.UUID; /** * Features should be able to represent a GVF (which is a more generic version of a VCF) * See http://genomebiology.com/2010/11/8/R88 * * We will want to tag features and version features, however we probably do not want * ACL features on a Feature level since there will be many many features * @author dyuen / public abstract class Feature implements Taggable { /* * Strand locations of features.

Solution content

import java.util.UUID;

/**
 * Features should be able to represent a GVF (which is a more generic version of a VCF)
 * See http://genomebiology.com/2010/11/8/R88
 * 
 * We will want to tag features and version features, however we probably do not want 
 * ACL features on a Feature level since there will be many many features
 * @author dyuen
 */
public abstract class Feature implements Taggable {

    /**
     * Strand locations of features.

File
Feature.java

Developer's decision
Combination

Kind of conflict
Class signature
Comment

Chunk

Conflicting content
public long getVersion(); /** <<<<<<< HEAD * Allow the user to override the version for a subject * @param version version to set on subject / public void setVersion(long version); ======= Set version for a subject * @param version Version to set on subject. / public void setVersion(String version); /* * Returns the subject (if any) that represents a previous version. * * @return Versionable Previous (preceding) subject that represents an earlier version of the subject. / public Versionable getPrecedingVersion(); /* * Sets the relationship to an earlier version of the subject. * * @param predecessor Preceding subject that represents an earlier version of this subject. */ public void setPrecedingVersion(Versionable predecessor); >>>>>>> f008466f2348366e29db04c6fe1c4b0fbbc6e94a }

Conflicting content

    public long getVersion();
    
    /**
<<<<<<< HEAD
     * Allow the user to override the version for a subject
     * @param version version to set on subject
     */
    public void setVersion(long version);
=======
     * Set version for a subject
     * @param version Version to set on subject.
     */
    public void setVersion(String version);

    /**
     * Returns the subject (if any) that represents a previous version.
     *
     * @return Versionable Previous (preceding) subject that represents an earlier version of the subject.
     */
    public Versionable getPrecedingVersion();

    /**
     * Sets the relationship to an earlier version of the subject.
     *
     * @param predecessor Preceding subject that represents an earlier version of this subject.
     */
    public void setPrecedingVersion(Versionable predecessor);
>>>>>>> f008466f2348366e29db04c6fe1c4b0fbbc6e94a
}

Solution content
public long getVersion(); /* * Set version for a subject * @param version Version to set on subject. / public void setVersion(String version); /* * Returns the subject (if any) that represents a previous version. * * @return Previous (preceding) subject that represents an earlier version of the subject. / public Versionable getPrecedingVersion(); /* * Sets the relationship to an earlier version of the subject. * * @param predecessor Preceding subject that represents an earlier version of this subject. */ public void setPrecedingVersion(Versionable predecessor); }

Solution content

    public long getVersion();

    /*
     * Set version for a subject
     * @param version Version to set on subject.
     */
    public void setVersion(String version);

    /**
     * Returns the subject (if any) that represents a previous version.
     *
     * @return Previous (preceding) subject that represents an earlier version of the subject.
     */
    public Versionable getPrecedingVersion();

    /**
     * Sets the relationship to an earlier version of the subject.
     *
     * @param predecessor Preceding subject that represents an earlier version of this subject.
     */
    public void setPrecedingVersion(Versionable predecessor);
}

File
Versionable.java

Developer's decision
Manual

Kind of conflict
Comment
Method interface

Projects >> seqware >>946c6f0dee96bf16a3c0b6d6c5919cb3ab97bfe3