Cześć, aktualnie robię projekt zespołowy i wykonując swojego taska, ktoś z zespołu dokończył encję, które dla mojej encji miała być tylko zaślepką, no i zrodził się konflikt. Będąc na gałęzi main zrobiłem git pull i wszedłem na swoją gałąź. Będąc na swojej gałęzi wpisałem git rebase main no i pojawiło mi się to:
Encja Cart:
import com.sun.istack.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
import javax.persistence.*;
<<<<<<< HEAD
=======
import java.math.BigDecimal;
>>>>>>> 4996893 (JDP211201-14 cart entity)
import java.util.ArrayList;
import java.util.List;
@Entity
@Getter
@NoArgsConstructor
@Table(name = "CARTS")
public class Cart {
@Id
@GeneratedValue
@NotNull
@Column(name = "CART_ID",unique = true)
private Long id;
@NotNull
@Column(name = "TOTAL_PRICE")
private BigDecimal totalprice;
@ManyToOne(targetEntity = User.class, cascade = CascadeType.ALL)
@JoinColumn(name = "user_id")
private User user;
<<<<<<< HEAD
@ManyToOne
@JoinColumn(name = "order_id")
private Order order;
@OneToMany(
targetEntity = Item.class,
mappedBy = "cart",
cascade = CascadeType.ALL,
fetch = FetchType.LAZY
)
private List<Item> items = new ArrayList<>();
=======
@OneToMany(targetEntity = Item.class, mappedBy = "cart", cascade = CascadeType.ALL)
private List<Item> items;
@OneToOne(cascade = CascadeType.ALL)
private Order order;
public Cart(BigDecimal totalPrice) {
this.totalprice = totalPrice;
this.items = new ArrayList();
}
>>>>>>> 4996893 (JDP211201-14 cart entity)
}
Encja Order:
<<<<<<< HEAD
import com.kodilla.ecommercee.GenericEntity;
import lombok.AllArgsConstructor;
=======
import com.sun.istack.NotNull;
>>>>>>> 4996893 (JDP211201-14 cart entity)
import lombok.Getter;
import lombok.NoArgsConstructor;
import javax.persistence.*;
<<<<<<< HEAD
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@Getter
@AllArgsConstructor
@NoArgsConstructor
@Entity(name = "orders")
public class Order extends GenericEntity {
@Column(name = "orderDate")
private LocalDate orderDate;
@Column(name = "deliveryDate")
private LocalDate deliveryDate;
@Column(name = "finalCost")
private BigDecimal finalCost;
@Column(name = "status")
private String status;
@ManyToOne
@JoinColumn(name = "USER_ID")
private User user;
@OneToMany(
targetEntity = Item.class,
mappedBy = "order",
cascade = CascadeType.ALL,
fetch = FetchType.LAZY
)
private List<Item> items = new ArrayList<>();
@OneToMany(
targetEntity = Cart.class,
mappedBy = "order",
cascade = CascadeType.PERSIST,
fetch = FetchType.LAZY
)
private Set<Cart> carts;
=======
@Entity
@Getter
@NoArgsConstructor
@Table(name = "ORDERS")
public class Order {
@Id
@GeneratedValue
@NotNull
@Column(name = "ORDER_ID", unique = true)
private Long id;
@OneToOne(cascade = CascadeType.ALL)
@JoinColumn(name = "CART_ID")
private Cart cart;
>>>>>>> 4996893 (JDP211201-14 cart entity)
}
Encja Item:
<<<<<<< HEAD
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import javax.persistence.*;
import java.math.BigDecimal;
@AllArgsConstructor
@NoArgsConstructor
@Entity
@Table(name="ITEMS")
=======
import com.sun.istack.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
import javax.persistence.*;
@Entity
@Getter
@NoArgsConstructor
@Table(name = "ITEMS")
>>>>>>> 4996893 (JDP211201-14 cart entity)
public class Item {
@Id
@GeneratedValue
<<<<<<< HEAD
@Column(name="id", nullable = false, unique = true)
private Long id;
@Column(name="quantity", nullable = false)
private int quantity;
@Column(name="price", nullable = false)
private BigDecimal price;
@ManyToOne
@JoinColumn(name="order_id")
private Order order;
@ManyToOne
@JoinColumn(name="cart_id")
private Cart cart;
=======
@NotNull
@Column(name = "ITEM_ID", unique = true)
private Long id;
@ManyToOne(cascade = CascadeType.ALL)
@JoinColumn(name = "CART_ID")
private Cart cart;
>>>>>>> 4996893 (JDP211201-14 cart entity)
}
Jak rozumiem, żeby pozbyć się konfliktu trzeba usunąć z każdych tych klas kod poniżej ========= i powyżej >>>>>>>>' jak również <<<<<<HEAD`, a co potem?
Spring 
Java 
scibi_92