Closed syphax-bouazzouni closed 1 year ago
Documenting steps for this one - just for my own reference:
➜ ontologies_api_ruby_client git:(master) git checkout -b ontoportal-lirmm-pl/feature-add-option-disable-invalidate-cache-for-all master
Switched to a new branch 'ontoportal-lirmm-pl/feature-add-option-disable-invalidate-cache-for-all'
➜ ontologies_api_ruby_client git:(ontoportal-lirmm-pl/feature-add-option-disable-invalidate-cache-for-all) git pull git@github.com:ontoportal-lirmm/ontologies_api_ruby_client.git pl/feature-add-option-disable-invalidate-cache-for-all
From github.com:ontoportal-lirmm/ontologies_api_ruby_client
* branch pl/feature-add-option-disable-invalidate-cache-for-all -> FETCH_HEAD
fatal: Not possible to fast-forward, aborting.
➜ ontologies_api_ruby_client git:(ontoportal-lirmm-pl/feature-add-option-disable-invalidate-cache-for-all) git pull --no-rebase git@github.com:ontoportal-lirmm/ontologies_api_ruby_client.git pl/feature-add-option-disable-invalidate-cache-for-all
From github.com:ontoportal-lirmm/ontologies_api_ruby_client
* branch pl/feature-add-option-disable-invalidate-cache-for-all -> FETCH_HEAD
Merge made by the 'ort' strategy.
lib/ontologies_api_client/read_write.rb | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
➜ ontologies_api_ruby_client git:(ontoportal-lirmm-pl/feature-add-option-disable-invalidate-cache-for-all) git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
➜ ontologies_api_ruby_client git:(master) git merge --no-ff ontoportal-lirmm-pl/feature-add-option-disable-invalidate-cache-for-all
Merge made by the 'ort' strategy.
lib/ontologies_api_client/read_write.rb | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
A correction and follow up of this https://github.com/ncbo/ontologies_api_ruby_client/pull/9