Projects information

Chunk

Conflicting content
private Team parent; private String name; private String code; <<<<<<< HEAD private String type; ======= >>>>>>> 8045b999e11992011ad02d8c1c7deebca4d69e24 private boolean active; private String description; private Boolean private_;

Conflicting content

  private Team parent;
  private String name;
  private String code;
<<<<<<< HEAD
  private String type;
=======
>>>>>>> 8045b999e11992011ad02d8c1c7deebca4d69e24
  private boolean active;
  private String description;
  private Boolean private_;

Solution content
private Team parent; private String name; private String code; private String type; private boolean active; private String description; private Boolean private_;

File
Team.java

Developer's decision
Version 1

Kind of conflict
Attribute

Chunk

Conflicting content
this.active = true; } <<<<<<< HEAD public Team(String name, String type, boolean active) { this.name = name; this.type = type; this.active = active; ======= public Team(Integer teamId) { this.teamId = teamId; >>>>>>> 8045b999e11992011ad02d8c1c7deebca4d69e24 } public Team(String name, String type, boolean active, boolean isProduct,

Conflicting content

    this.active = true;
  }

<<<<<<< HEAD
  public Team(String name, String type, boolean active) {
    this.name = name;
    this.type = type;
    this.active = active;
=======
  public Team(Integer teamId) {
    this.teamId = teamId;
>>>>>>> 8045b999e11992011ad02d8c1c7deebca4d69e24
  }

  public Team(String name, String type, boolean active, boolean isProduct,

Solution content
this.active = true; } public Team(String name, String type, boolean active) { this.name = name; this.type = type; this.active = active; } public Team(String name, String type, boolean active, boolean isProduct,

Solution content

    this.active = true;
  }

  public Team(String name, String type, boolean active) {
    this.name = name;
    this.type = type;
    this.active = active;
  }

  public Team(String name, String type, boolean active, boolean isProduct,

File
Team.java

Developer's decision
Version 1

Kind of conflict
Attribute
Method signature

Chunk

Conflicting content
this.code = code; } <<<<<<< HEAD @Column(name = "TYPE", length = 10, nullable = false) public String getType() { return this.type; } public void setType(String type) { this.type = type; } ======= >>>>>>> 8045b999e11992011ad02d8c1c7deebca4d69e24 @Column(name = "ACTIVE", nullable = false) public boolean isActive() { return this.active;

Conflicting content

    this.code = code;
  }

<<<<<<< HEAD
  @Column(name = "TYPE", length = 10, nullable = false)
  public String getType() {
    return this.type;
  }

  public void setType(String type) {
    this.type = type;
  }

=======
>>>>>>> 8045b999e11992011ad02d8c1c7deebca4d69e24
  @Column(name = "ACTIVE", nullable = false)
  public boolean isActive() {
    return this.active;

Solution content
this.code = code; } @Column(name = "TYPE", length = 10, nullable = false) public String getType() { return this.type; } public void setType(String type) { this.type = type; } @Column(name = "ACTIVE", nullable = false) public boolean isActive() { return this.active;

Solution content

    this.code = code;
  }

  @Column(name = "TYPE", length = 10, nullable = false)
  public String getType() {
    return this.type;
  }

  public void setType(String type) {
    this.type = type;
  }

  @Column(name = "ACTIVE", nullable = false)
  public boolean isActive() {
    return this.active;

File
Team.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method declaration

Projects >> tourismwork >>78979771603804d18684be7e9f7cab66cdc09963