search

patrickfuchs / buildH

:computer: Build hydrogen atoms from united-atom molecular dynamics of lipids and calculate the order parameters.
https://buildh.readthedocs.io/
BSD 3-Clause "New" or "Revised" License
14 stars 7 forks source link

Archive repository to Software Heritage #129

Closed pierrepo closed 3 years ago

pierrepo commented 3 years ago

On release only.

Fix #128

patrickfuchs commented 3 years ago

All the commits we pushed yesterday on the master branch appear again here, is there a reason?

HubLot commented 3 years ago

arf indeed :( a rebase on the master is still possible?

pierrepo commented 3 years ago

I already did a rebase :thinking:

HubLot commented 3 years ago

i guess something went wrong :s You could rewrite the history of the branch with git rebase -i, remove the useless commit and squash the 2 needed into 1 :)

pierrepo commented 3 years ago

Sorry. I'm unable to do this. Could you have a look? Or should I delete the branch?

HubLot commented 3 years ago

okay, i look at it

HubLot commented 3 years ago

Okay, I think I fix it. could you verify @pierrepo ?

pierrepo commented 3 years ago

This looks very good :star_struck: Thanks @HubLot

pierrepo commented 3 years ago

@patrickfuchs you can merge.