Closed nobkd closed 1 year ago
There is a merge commit in the list of commits - maybe you can get rid if that one.
Okay. Then I'll undo the last 3 commits and resolve your comments (in a few hours). After merging I'll do another pr to change some code pieces you've added previously
This should resolve the merge conflicts. I've done it this way, because you didn't want to have a Merge commit.
Could you resolve that merge conflicts by running git pull --rebase origin master
to rebase onto origin/master?
That way you don't need to add a merge commit.
It's probably the easiest to read the
diff
of the individual commits instead of comparing everything at once. The commit names should be reasonably accurate in describing what was changed.Here is a rough summary of the changes:
'
as main quotation markaction
option with default on'in'
toinstall_packages
for code reusing (maybe change function name?)