search

sys-bio / temp-biomodels

Temporary place for coordination of updating existing Biomodels
Creative Commons Zero v1.0 Universal
2 stars 2 forks source link

parallelization of the Actions YAML and the definition of additional … #121

Closed freiburgermsu closed 2 years ago

freiburgermsu commented 2 years ago

…fix-entries command arguments

I am not sure why it cannot automatically merge. I will more regularly update my local main branch to prevent conflicts in the future.

jonrkarr commented 2 years ago

The website has limited functionality for merging. This can be merged by following the steps below (same instructions that GitHub outlines below).

Step 1: From your project repository, bring in the changes and test.

git fetch origin
git checkout -b github_actions_failure origin/github_actions_failure
git merge main

Step 2: Merge the changes and update on GitHub.

git checkout main
git merge --no-ff github_actions_failure
git push origin main