the real reason i haven't merged the latest postmill master branch into jstpst yet

Submitted by hollyhoppet at January 25, 2018, 9:46 PM in programming

i don't feel like dealing with git merge conflicts lol

Comments

You must log in or register to comment.

musou wrote at January 25, 2018, 9:48 PM

git gud???? more like git... bad

hollyhoppet wrote at January 25, 2018, 9:49 PM

lol if you think git is bad you should try svn or worse cvs

hollyhoppet wrote at January 25, 2018, 9:50 PM

you kids don't know how good you have it these days

hollyhoppet wrote at January 25, 2018, 9:50 PM

hi i'm a disgruntled senior dev

musou wrote at January 25, 2018, 9:52 PM

i actually love git. i think hg is my favorite features-wise but it is SOOOOO slow and git isn't.

i had to use cvs in college beacuse one of our instructors insisted on it. it sucked ass.

Moonside wrote at January 25, 2018, 11:17 PM

Git is still kinda gross

I'm eagerly waiting for a beautiful future system

musou wrote at January 25, 2018, 11:18 PM

if they just redid the interface to be more like mercurial i think it'd be great

Moonside wrote at January 26, 2018, 2:37 PM

I think that interfaces can be many and that's perhaps not the issue, even if the command line interface is clunky and more tuned to the particularities of Linus brain folds than anything else. Magit in Emacs is pretty great and I like it and there's no shortage of other GUIs for Git. But I feel like the basic model could be more, say, principled or elegant. I find it somewhat ludicrous that this book is 456 pages long.

This isn't just Git either, I really feel that a lot of utility software for coding has tons of usability issues and quite often it's not like the innards are any better.

flabberghaster wrote at January 26, 2018, 12:51 AM

I know right... Learn to mercurial, noobs

emma wrote at January 25, 2018, 10:04 PM

wow you're bad

I've made some efforts towards letting you override stuff (currently templates and translations) without messing with the git tree, but there's still a lot of work to do in that area.

hollyhoppet wrote at January 25, 2018, 10:08 PM

i am bad the only problem i'll probably have is i overwrote the raddle frog image and the favicon before you changed that folder name from i think "web" to "public" lol

hollyhoppet wrote at January 25, 2018, 10:13 PM

oh and some heroku config file stuff

emma wrote at January 25, 2018, 10:56 PM

The heroku stuff I'm sure can be added upstream in some fashion. I'm a bit surprised composer.json was used for running commands instead of making an entirely new script.

Will remove the favicon/apple-touch-icon later so there'll be no conflicts there. Blame Symfony 4 for the directory renaming, it broke in all kinds of subtle ways when I tried using the old directory structure, lol.

hollyhoppet wrote at January 26, 2018, 3:39 PM (edited at January 26, 2018, 3:39 PM)

Yeah, having the heroku stuff in postmill main would be nice but I'm not comfortable with that until a way to handle the ephemeral file system is in as well. There's a reason we don't have thumbnails here lol. That's kind of lower in priority though for me compared to trying to get an archive together for the old thefempire.org posts.

Also maybe there's a way to do scripts in heroku aside from composer.json but I haven't figured it out. I write Java services and did ios before that so user facing web stuff is not a strength of mine.