Show conflicts to parent branch

types.go

@@ -21,36 +21,38 @@ type PullRequest struct {
 
 type PRDetails struct {
 	PullRequest
-	Body             string
-	CreatedAt        time.Time
-	BaseRef          string
-	HeadRef          string
-	Mergeable        string
-	MergeState       string
-	Assignees        []string
-	Reviewers        []Reviewer
-	Labels           []string
-	Milestone        string
-	Additions        int
-	Deletions        int
-	ChangedFiles     int
-	CommitCount      int
-	CommentCount     int
-	HeadOID          string
-	CheckState       string
-	Checks           []Check
-	ReviewDecision   string
-	Conversation     []PRComment
-	Reviews          []ReviewSummary
-	Permissions      ViewerPermissions
-	Requirements     MergeRequirements
-	Threads          []ReviewThread
-	ThreadsTruncated bool
-	Timeline         []TimelineEvent
-	Rulesets         []Ruleset
-	MergeQueue       *MergeQueue
-	FromCache        bool
-	CachedAt         time.Time
+	Body              string
+	CreatedAt         time.Time
+	BaseRef           string
+	HeadRef           string
+	Mergeable         string
+	MergeState        string
+	ConflictFiles     []string
+	ConflictFileError string
+	Assignees         []string
+	Reviewers         []Reviewer
+	Labels            []string
+	Milestone         string
+	Additions         int
+	Deletions         int
+	ChangedFiles      int
+	CommitCount       int
+	CommentCount      int
+	HeadOID           string
+	CheckState        string
+	Checks            []Check
+	ReviewDecision    string
+	Conversation      []PRComment
+	Reviews           []ReviewSummary
+	Permissions       ViewerPermissions
+	Requirements      MergeRequirements
+	Threads           []ReviewThread
+	ThreadsTruncated  bool
+	Timeline          []TimelineEvent
+	Rulesets          []Ruleset
+	MergeQueue        *MergeQueue
+	FromCache         bool
+	CachedAt          time.Time
 }
 
 type Check struct {