I tried running those two commands and got merge conflicts:
jacksonwalters@jaxmacbookair sage % git rebase origin/develop
Auto-merging src/sage/doctest/parsing.py
CONFLICT (content): Merge conflict in src/sage/doctest/parsing.py
error: could not apply db5bf6ce535... Filter out R warnings
hint:
On Sun, Oct 20, 2024 at 7:06 PM Jackson Walters
wrote:
>
> I don’t think I understand. I am just making commits in PR #38455. If I
> switch to the develop branch, surely these won’t have the changes I’m looking
> to see when I build? I’m probably just misunderstanding how git works.
I'm not tel
I don’t think I understand. I am just making commits in PR #38455. If I
switch to the develop branch, surely these won’t have the changes I’m
looking to see when I build? I’m probably just misunderstanding how git
works.
Thanks,
Jackson
On Sun, Oct 20, 2024 at 7:00 AM Dima Pasechnik wrote:
>
>
On 20 October 2024 01:58:14 BST, Jackson Walters
wrote:
>Yes, it is 10.5.beta0. I’m not entirely sure how to switch to the latest
>beta version. I’m just on the branch of the PR that I’m working on
>currently.
>
>Do I have to rebase?
Rebasing is typically automatic, if you just touched a few
