Hello,
I am trying to merge the branch
public/optional_spkg/differential_algebra-13268 into current version of
Sage but am running into issues. Pulling returned a merge conflict:
CONFLICT (modify/delete): src/module_list.py deleted in HEAD and modified
in 81aef63dc5e33948f1f37a995ac09189d0a99e
I'm working on #17067 to fix a merge conflict. I have fixed a number of
merge conflicts in the past with no issues, but every once in awhile I run
into the issues I'm having with 17067. I figured it is time to figure out
what I'm doing wrong here.
- I merge in the lastest beta to my ticket
- us
