invalid commit history master branch?

[danielweck]

CC @Boichenko @snemegeer

Hello, I am seeing some traffic in the newdb feature branch (this looks really good, thanks!): https://github.com/readium/readium-lcp-server/commits/feature/newdb but it looks like some commits were inadvertantly pushed to the master branch: https://github.com/readium/readium-lcp-server/commits/master

Am I correct?

[snemegeer]

Probably an error of my part, I'm sorry. It should not been pushed yet to master

best regards, Stefaan

http://www.edistat.com

Le 18/08/2016 à 11:28, Daniel Weck a écrit :

CC @Boichenko https://github.com/Boichenko @snemegeer https://github.com/snemegeer

Hello, I am seeing some traffic in the |newdb| feature branch (this looks really good, thanks!): https://github.com/readium/readium-lcp-server/commits/feature/newdb but it looks like some commits were inadvertantly pushed to the |master| branch: https://github.com/readium/readium-lcp-server/commits/master

Am I correct?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/readium/readium-lcp-server/issues/33, or mute the thread https://github.com/notifications/unsubscribe-auth/AFW0NwmsjUNe5laMDkkD6RuGT4U71VyAks5qhCXRgaJpZM4JnTPW.

[danielweck]

Would you like me to rewrite the git history? We can easily erase the last invalid commits.

[danielweck]

git checkout master
git pull
git reset --hard 8804a4c89d8e2c820b9d8a25eea9e888ae9b51bd
git push origin --force

[snemegeer]

As I understand the only branch with problem.go (error reporting using rfc 7807) should be in the feature/newdb dev branch.

so as far as I'm concerned, yes I think it is a good idea to keep it only there until the branch is stable

kind regards,

Stefaan Nemegeer

---

19 bis avenue Léon Gambetta - 92120 Montrouge +33 (0)1 55 58 32 00 Tite-Live http://www.titelive.fr - ePagine.fr http://www.epagine.fr

• Place des Libraires http://www.placedeslibraires.fr - EdiStat http://www.edistat.com

Le 18/08/2016 à 11:58, Daniel Weck a écrit :

|git checkout master git pull git reset --hard 8804a4c89d8e2c820b9d8a25eea9e888ae9b51bd git push origin --force |

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/readium/readium-lcp-server/issues/33#issuecomment-240678514, or mute the thread https://github.com/notifications/unsubscribe-auth/AFW0N7-55GorljiDVCG5AcpT_AweO5ogks5qhCy-gaJpZM4JnTPW.

[llemeurfr]

The last commit is still there on the master branch, where it should not. I understand that Stefaan says to Daniel "go, remove it from master, this commit is also present in the newdb branch, nothing is lost". Do I mis-interpret or will @danielweck erase this master commit asap?

[danielweck]

I will remove the last 3 commits, in 30mn or so.

[danielweck]

I mean: last 3 commits plus the merge commit :)