search

tdcosim / TDcoSim

T&D co-simulation package
Other
24 stars 8 forks source link

User guide correction #49

Closed zsjjames closed 2 years ago

zsjjames commented 2 years ago

Updates on User Guide (Please ignore commits before Dec-2021, the user guide was entirely updated based on copy from v2.0.0rc2_dev after Dec-2021)

sibyjackgrove commented 2 years ago

@zsjjames It seems there are conflicts between the dev version and your version in many .py files. To merge this pull request we would need to resolve the conflicts which would take quite some time. Since you were only making changes to the .md files in the user guide and README there should not be conflicts in the .py files. I think this is because you branched off an earlier version of TDcoSim which doesn't have the latest updates. To avoid errors I think it is better you create a new branch and add the .md files you changed to that branch. Then you can submit a pull request again.