Message from @Ƶero
Discord ID: 463905535222349825
I believe so.
Why do you ask @M4Gunner ?
because i havent used excel in a long time
Ooh
Dealing with devs who ignore merge requests because they don't understand how to use github/gitlab is a surprisngly common thing now. "Oh here, I fixed this bug for you" and it just rots till the code base changes so much it can't be merged anymore and I delete it.
also if you disable the issue tracker and want me to do something like talk to you on Google Groups or some equally awful service I hope you get some sort of non-fatal but uncomfortable disease in your testicles.
and then you have merge conflicts.
and they respond with: ???
"rebase"
"???"
`git reset --hard`
That's why I use mercurial.
I had to fix a mercurial server about a year ago that had destroyed every single repository on it after an update
I mean I've had messed up git repos but this was next level
still better than f*ing SVN though seriously fuck SVN
Weird, I never seen that.
You have to go out of your way to fuck up a mercurial repo.
dude, the people who were using it were/are idiots
WordPress shop
couldn't do a mysql dump on the command line to save their lives - they literally installed some admin panel software just to do dumps
I wrote them scripts to do a bunch of shit
Worst repos I had to work with were git, full of hooks everywhere. You literally couldn't commit anything without first setting up a bunch of environment variables and having certain special programs installed.
ugh that's pretty terrible
worst hook issue I ever encountered was someone set up a repo where you had to tie an issue that you created beforehand to a push. It actually worked well beause they kept track of things that way but it was a pain in the ass
litearlly that's what feature branches are for
Even worse, the project manager would delete the entire development branch from the repo's history every 2 weeks because he fucked something up. Suddenly I couldn't even pull any new changes from the repo, because the branch where I forked off to do my work didn't exist.
well I can't say I condone everyone working in the same branch, but I can feel your pain there
We didn't work on the same branch, we would each fork off the "devel" branch into our own feature branch.
But once the "devel" branch disappears entirely from the repo's history, git errors out.
aah so you mean people would have offsets beause some people had more commits than others before the devel branch dissapeared
and merge conflicts and crap
And the hooks prevented it from looking at my own repo's "devel" branch. If you do that in Mercurial (and I assume unhooked git), the missing nodes would be restored automatically.
did he also rebase shit constantly?
He was the one that would merge the feature branches back into "devel" and eventually merge it into "stable."
ugh
I think your preference for mercurial here may be more an issue of dealing with people who use git poorly than actual faults of git
kind of like how I dislike STL in C++
Nah, on git, it's a feature to change the history of the repo, on hg, the feature is that you **can't** change the history.
I get what you're saying, but absue of a feature and availability of the feature aren't the same thing