Use local branch if newer than remote branch #33
Conversation
If upstream is a user's fork that doesn't get updated, we want to instead use the local branch, which is more likely to be up to date.
There was a problem hiding this comment.
I think this is exactly the behavior that I was looking for in #32, thanks!
I left some comments about structure and documentation for your consideration. While you consider those, I'll pull this branch and test if it would have fixed the issue I was seeing on my rmm branch.
There was a problem hiding this comment.
I just tested this in the situation that led me to create #32, and found that as of these changes the hook works exactly as described there!
Namely, I saw these 2 commits in commits_to_try:
[<git.Commit "cab7e06cc40eaf9dc98f5563a8cc399fbc876388">, <git.Commit "9e6db746f1a4a6361fb9fadf381f749dc52faaea">]
And then the hook preferring the newer one on my local branch (cab7e0) to the older one on the branch on my fork (9e6db7).
Nice work!
|
I tested this again after the recent commits, still works perfectly. Let's merge it 😁 |
If upstream is a user's fork that doesn't get updated, we want to instead use the local branch, which is more likely to be up to date.
Fixes: #32