Post 9uoL6r5Co1jiOfM9Qm by tfidf@fosstodon.org
(DIR) More posts by tfidf@fosstodon.org
(DIR) Post #9uoDME3QsjH2LsLT1s by kev@fosstodon.org
2020-05-07T16:35:05Z
0 likes, 0 repeats
So no-one is going to convince me that Git isn't a complete and utter shit show. I've been trying to get Git integration to work with Atom for the last hour. No go.I clone the repo, connect it all up and it's good. Try to push and I get "The tip of your current branch is behind the remote computer."Tried pulling, no difference. Even when creating a new branch.I am steadfast in my belief that Git is a steaming pile of over-complicated horse shit.
(DIR) Post #9uoDWC0HMTxKt3cfui by piggo@piggo.space
2020-05-07T16:37:11.588066Z
0 likes, 0 repeats
@kev it's meant to be used from the terminal. In my experience git GUIs have been almost universally horrible unusable garbage
(DIR) Post #9uoE3mystvWT7vzTQu by meduz@m.nintendojo.fr
2020-05-07T16:42:54Z
0 likes, 0 repeats
@kev Well, it depends on your needs. Basically, Git can be good for 1) versioning 2) keeping code in sync on a distant server 3) collaborating.And there’s plenty of way to use Git.If you’re a macOS user, I strongly recommend to give an eye on GitUp for its clarity (personal opinion of course) and the keyboard shortcuts: https://gitup.co (it’s open source).I almost never use the command line and GitUp is the only GUI that I find useful.
(DIR) Post #9uoENxVjSeWfZmyMAy by amolith@social.nixnet.services
2020-05-07T16:46:52Z
0 likes, 0 repeats
@kev This is the big reason I never recommend that people integrate git with their editor/IDE until they're at least marginally experienced with it in cli. IDEs generally hide a lot of things in the background and git is certainly no exception.
(DIR) Post #9uoEbkCpj0R0MlhpvE by amolith@social.nixnet.services
2020-05-07T16:49:20Z
1 likes, 0 repeats
@sheogorath If you want, we can maybe set up a QA sessions on the weekend with people from fosstodon 😉(this needs to happen)@kev
(DIR) Post #9uoEcVz05jtGXlbT1c by machete_Badger@fosstodon.org
2020-05-07T16:49:09Z
0 likes, 0 repeats
@kev I would blame the GUI editors (and more specifically Atom in this case) but I know how you feel, I avoid GitKraken and such for the same reason. All I know is that VSCodium's Git integration is actually pretty nice and gave me a fair amount of control, but I'm missing a bit of information to form a complete opinion about your toot.
(DIR) Post #9uoEeKLuIwlJ3FBLHM by sir@cmpwn.com
2020-05-07T16:49:14Z
0 likes, 0 repeats
@kev that you tried integrating it with Atom says everything. Atom is the shitshow here. Use git from the CLI like a goddamn professional
(DIR) Post #9uoEgo5wh3UxsKtlmS by jamie@mastodon.ino.org.uk
2020-05-07T16:50:08Z
0 likes, 0 repeats
Oh no! Collisions suck. At least you are safe.
(DIR) Post #9uoF99rtKmpTVpqMwi by basil@sarcasm.stream
2020-05-07T16:55:08Z
0 likes, 0 repeats
@kev yeah, I'm not fond of it.Have had a smooth enough ride since I started using github desktop app. But have had my fair share of "oh what the fuck is wrong with you now" moments in the past.Which is mad. Considering my (and your) use case is just a single user trying to send changes to a server.
(DIR) Post #9uoGAQmY2CX6DIVzlY by tyil@soc.fglt.nl
2020-05-07T17:06:51.940150Z
0 likes, 0 repeats
@sir @kev I haven't had any issues using git *daily* for over a decade. People at work and social circles have similar experiences. People around the world seem to have similar experiences, which has caused it to become the de-facto standard for version control. Perhaps the problem isn't git.
(DIR) Post #9uoHoMiUfWWV8tDzsm by fritogotlayed@fosstodon.org
2020-05-07T17:23:51Z
0 likes, 0 repeats
@kev Man. I'm sorry you feel that way about git. I personally love git but I don't use it integrated with an IDE. I'm a terminal purist I guess. I have coworkers that use it with VSCode though and don't have issues. Maybe it's just the ATOM integration and not git itself? :-)
(DIR) Post #9uoJ8H0pgcS3CGrLTE by ggarron@masto.one
2020-05-07T17:39:43Z
0 likes, 0 repeats
@kev I've using it for years with my blog. Single user mode :).I use it on the CLI, and no problems. Helped me when making big changes to the blog like switching theme.
(DIR) Post #9uoJL5IKZ2EGcT9Wym by ggarron@masto.one
2020-05-07T17:42:08Z
0 likes, 0 repeats
@kev Maybe you can clone, use Atom to make changes.Then from the terminal git add -A git commit -m "my change"git push
(DIR) Post #9uoKxQU8KL4zIZWIZE by nirmal@fosstodon.org
2020-05-07T17:59:52Z
0 likes, 0 repeats
@kev I don't know about Atom integration tbh.Give some time and research about that. I can be of some help to you. We can DM if you like.Just want to say I'm not a hardcore git expert previously, but I've built most parts of the Git hosting service https://sorcia.org in 5 weeks time which happened in February end to March 3rd week.Not trying to brag about it, but wanted to say that you can make it work too :) You just need some time to get used to that by doing some reading. Or DM me.
(DIR) Post #9uoL6r5Co1jiOfM9Qm by tfidf@fosstodon.org
2020-05-07T18:01:51Z
0 likes, 0 repeats
@kev you're mistaken there. As soon as you get Git you will not want to use anything else. It has quite a learning curve and tends to frustrate at first (been there) but keeping at it will. Pay. Off.
(DIR) Post #9uoMGUtQGLfaQS0Slk by chris@mastodon.chriswiegman.com
2020-05-07T17:16:38Z
0 likes, 0 repeats
@tyil @kev @sir I haven't had issues with GIT in over a decade either... I even teach workshops on it. That said, It doesn't mean Kev is wrong. Most problems I see people have are in situations like his when folks try hooking it up through another app like Atom or others. Version mismatches, auth issues, etc are real.
(DIR) Post #9uoMGV5pWDav2voN6m by tyil@soc.fglt.nl
2020-05-07T18:15:10.674477Z
0 likes, 0 repeats
@chris @kev @sir It's quite wrong on the "over-complicated horse shit" remark. Atom, however, I have used and have seen plenty of issues with, other than the obvious performance one. Perhaps people should think a bit more simplistic, and not try to make one giant monolith capable of everything poorly, but use the right interface and the right environment to accomplish the task at hand. @sir's advice to use a CLI seems rather appropriate.
(DIR) Post #9uoNVBNFDSGgBcWPGy by chozron@linuxrocks.online
2020-05-07T18:28:39Z
0 likes, 0 repeats
@kev That makes the issue with Atom not Git.
(DIR) Post #9uoNXczlUXnoQohnmK by 9iXcMi23bT7adhJMSe.thor@social.thorjhanson.com
2020-05-07T18:28:19Z
0 likes, 0 repeats
I reccomend just using it on the command line; 90% of the time there are four commands you use: pull, add, commit, push. I find dinking about with GUIs just more work for no real benefit.
(DIR) Post #9uoSVrP1SCpkJ5UoHQ by AAMfP@fosstodon.org
2020-05-07T19:24:56Z
0 likes, 0 repeats
@kev
(DIR) Post #9uoWGPCSQbhqJKVMPo by TheFuzzStone@fosstodon.org
2020-05-07T20:07:14Z
0 likes, 0 repeats
@piggo, what about GitKraken?
(DIR) Post #9uoWLTVnp7kn8FyFA8 by piggo@piggo.space
2020-05-07T20:08:09.267342Z
0 likes, 0 repeats
@TheFuzzStone I tried it but found it too confusing - it made it really easy to mess up branches etc
(DIR) Post #9uoeEP16w9FenUklxg by msmith@fosstodon.org
2020-05-07T21:35:56Z
0 likes, 0 repeats
@kev I’m still bummed that fossil never took off
(DIR) Post #9uou19pxf86rDhFDzk by reykjalin@fosstodon.org
2020-05-08T00:33:01Z
0 likes, 0 repeats
@kev I’d recommend you try a UI that’s not embedded in an editor. Personally I really like Sublime Merge. It’s a really well made interface for git.Outside of that, what others are saying is true; you can’t really *get* git without learning the CLI. It’s complicated, but worth it.Just start with learning `git add`, `git commit`, `git push`, and `git pull`. And https://ohshitgit.com is your friend 🙂A good way to get started is to add+commit from a UI and push+pull from the CLI ☺️
(DIR) Post #9upGi8BjrlG1YAKLmC by phillipcouto@fosstodon.org
2020-05-08T04:45:56Z
0 likes, 0 repeats
@kev this may help you understand git concepts more (https://learngitbranching.js.org/).Remember git was built originally to version control the Linux kernel. The commandline is the best place to learn, that way you are not mislead by GUI.