News for hackers. Stuff that matters.

A comment on Ask HN: Google/FB engineers, Do you like Mercurial?. Parent comment

Re:Ask HN: Google/FB engineers, Do you like Mercurial? by lifebeyondfife on Thursday May 07, 2015 @09:29AM (#9504858)
Ah ok, I think I understand the concern. So 'git fetch' and 'git merge' explicitly will stop an upstream rebase from making destructive changes to the history of your local branch(?)

As you say it's bad practice and shouldn't happen. I use gitlab and GitHub where branches can be protected to only allow merges via their web interfaces.

[ Parent | on HN ]
Re:Ask HN: Google/FB engineers, Do you like Mercurial? by sytse on Thursday May 07, 2015 @09:38AM (#9504919)
GitLab CEO here, in GitLab you can protect branches to not be rebased at all (web or command line), see https://about.gitlab.com/2014/11/26/keeping-your-code-protec...

I'm not aware that GitHub offers the same functionality.

[ Parent | on HN ]
Re:Ask HN: Google/FB engineers, Do you like Mercurial? by c0wb0yc0d3r on Thursday May 07, 2015 @09:57AM (#9505037)
On the page where the ssh finger print is listed, can you list the RSA finger print too?

I am not well versed in working with git over ssh, but after following the instructions on GitLab to generate a key, then git would keep showing me the RSA finger print which doesn't match the one provided on the website. After looking around a bit, it looks like the one listed is ECDSA.

tl;dr: It was late. Finger prints didn't match. Only logical assumption was NSA. :P (Not really, obviously, but the finger prints could be more clear.)

[ Parent | on HN ]
Re:Ask HN: Google/FB engineers, Do you like Mercurial? by sytse on Thursday May 07, 2015 @10:06AM (#9505111)
Thanks, fixed in https://gitlab.com/gitlab-com/www-gitlab-com/commit/2493f208...
[ Parent | on HN ]
Re:Ask HN: Google/FB engineers, Do you like Mercurial? by sytse on Friday May 08, 2015 @12:32PM (#9512591)
Also, we added all other keys: https://gitlab.com/gitlab-com/www-gitlab-com/commit/79bdb63f...
[ Parent | on HN ]
Re:Ask HN: Google/FB engineers, Do you like Mercurial? by gcb0 on Tuesday May 12, 2015 @09:19PM (#9536127)
but you still damage your local copy and it's a pain to clean up, specially if you had local changes/commits
[ Parent | on HN ]
Re:Ask HN: Google/FB engineers, Do you like Mercurial? by sytse on Wednesday May 13, 2015 @03:36AM (#9537368)
The idea is not to have upstream rebases so you can't pull them by accident.
[ Parent | on HN ]
Re:Ask HN: Google/FB engineers, Do you like Mercurial? by leni536 on Thursday May 07, 2015 @09:36AM (#9504905)
I don't think git pull would ever destroy your history (AFAIK it's exactly the same as a fetch+merge), at worst you end up in a merge conflict, but it's easily revertable. However after a git fetch and a git log you can see beforehand if there is anything nasty going on.
[ Parent | on HN ]