pr-base-commit doesn't show the most recent common commit (should it?)

[fregante]

Description

Originally posted in #6538 (review)

What should we do? Since the PR was not rebased, maybe it makes sense that the "base commit" is the original, but it's not consistent with the rest of the UI: the "base commit" is not just "1 commit behind"

---

Step 4: commit on main ⚠️

• The UI correctly detects it's 1 commit behind ✅
• The 1 commit page shows exactly 1 commit ✅
• The base commit is "wrong" (it's the same as before) ❌

How to replicate the issue + URL

refined-github/sandbox#68

Extension version

23.4.26

Browser(s) used

Chrome

Related

• restore-file occasionally restores the wrong commit #4679

[fregante]

I think it should use merge_base_commit

refined-github/source/features/restore-file.tsx

Line 16 in 3a6a522

return response.merge_base_commit.sha; // #4679

[134130]

How about updating the name base commit?
I think it will be confused when click 1 commit link and if there is no related with presented commit sha.
Maybe suggestion:

It’s 22 commits behind from commit abcd123

[fregante]

I'm not sure I follow. Why would there be no commits? If that's the case, it's the wrong link/commit (as described by this issue, presumably)

[134130]

Aha, You are meaning "since the commit is merged (not rebased), the base commit is not changed".

The title is This branch has bo conflicts with the base branch, So I thought sub content means comparing with the base branch's HEAD commit between the pr's latest merged commit