search

gap-system / GitHubPagesForGAP

Template for easily using GitHub Pages within GAP packages
https://gap-system.github.io/GitHubPagesForGAP/
Other
13 stars 11 forks source link

Instructions for updating #8

Closed cdwensley closed 7 years ago

cdwensley commented 7 years ago

Some comments after successfully updating gh-pages for the utils package. Instruction 2: should be "git remote" not "git remove". It's not just a question of whether gh-gap exists, but also whether it points to the correct place. I had to git remove my gh-gap and then git add the correct URL.
Instruction 4: my git complained that 'continue' was not an option in "git merge --continue", so I continued by repeatedly aborting and then doing a new "git pull gh-gap gh-pages". There were repeated conflicts in PackageInfo.g and README.md: git appeared to be combining chunks of these files from both utils and gh-pages.

fingolfin commented 7 years ago

Thanks, I updated the instructions again, hopefully addressing everything in your feedback.

cdwensley commented 7 years ago

Not sure that this is quite what you meant: Make sure the gh-gap remote exists and is in doubt. If in doubt, just re-add it: Perhaps: Make sure the gh-gap remote exists and has the correct URL. If in doubt, just re-add it: