Remove forced update when publishing nidm webpages

[cmaumet]

Currently, when the NIDM webpages are published online (cf. https://github.com/incf-nidash/nidm/wiki/Generate-the-NIDM-Website for more info) with:

fab publish

, the update of the gh-pages branch is forced (cf. https://github.com/incf-nidash/nidm/blob/master/doc/fabfile.py#L35).

I am wondering if we could change the set up to remove the --force option. This would be safer but also would keep track of changes on the website pages.

From the pelican documentation it does not look like --force is necessary, but when I tried removing it, I got a "non-fastforward" error:

Done: Processed 0 articles and 3 pages in 0.79 seconds.
[localhost] local: ghp-import output
[localhost] local: git push upstream gh-pages
To [email protected]:incf-nidash/nidm.git
 ! [rejected]        gh-pages -> gh-pages (non-fast-forward)
error: failed to push some refs to '[email protected]:incf-nidash/nidm.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Fatal error: local() encountered an error (return code 1) while executing 'git push upstream gh-pages'

@nicholsn: What do you think? Would you have any hints?

[khelm]

@cmaumet - Is this still a relevant issue or could this be closed?

[cmaumet]

Hi @khelm! Unfortunately, this is still current, the line in question has moved here: https://github.com/incf-nidash/nidm-specs/blob/master/doc/fabfile.py#L65.