Closed nw20 closed 11 months ago
Hi Richard, I had a merge conflict in the _toc.yml
file which I tried to resolve. The commit now reads merge branch 'master' into add_pf7_analysis_notebooks
. Obviously I don't want this to happen for the whole repo... is this just how the commit is described if I kept the changes from the new branch and deleted the 'master' version of _toc.yml
?
If this looks problematic please reject that merge request and I'll redo the TOC.
Check out this pull request on
See visual diffs & provide feedback on Jupyter Notebooks.
Powered by ReviewNB