search

primaryodors / primarydock

PrimaryOdors.org molecular docker.
Other
6 stars 4 forks source link

Sync commits from local stable branch. #126

Closed electronicsbyjulie closed 2 years ago

electronicsbyjulie commented 2 years ago

Idk what even is in this one.

electronicsbyjulie commented 2 years ago 
julie@amarantine:~/primarydock$ git checkout stable
Basculement sur la branche 'stable'
Votre branche est en avance sur 'origin/stable' de 7 commits.
  (utilisez "git push" pour publier vos commits locaux)
julie@amarantine:~/primarydock$ git pull
remote: Enumerating objects: 1, done.
remote: Counting objects: 100% (1/1), done.
remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0
Dépaquetage des objets: 100% (1/1), 652 octets | 652.00 Kio/s, fait.
Depuis https://github.com/primaryodors/primarydock
   97d8e64..ce34f1d  stable     -> origin/stable
Déjà à jour !
Merge made by the 'recursive' strategy.
julie@amarantine:~/primarydock$ git status
Sur la branche stable
Votre branche est en avance sur 'origin/stable' de 8 commits.

Argh. J'vais briser quelque chose.