You probably noticed force pushing was an item but I didn't talk about it. I decided to cut it out since it was almost entirely described as a team development problem so I'll cover it there instead.
Alas, some of us who work sleepily at times find themselves working with a “team”: the sleepy and the rational, patient versions of themselves. Covering that topic may help people who, like me, often find that they are in fact working against themselves because they forgot to pull before they pushed at some point and got code out of sync somehow
I had barely any experience with source control until I joined a big tech company and was forced to learn to use git. Now, I can never go back, especially for solo projects. It helps me logically organize my work, focus on one task at a time, and have a clear history of everything I've ever done. It also encourages clean coding principles like separation of concerns, composition over inheritance, etc... Honestly, the single biggest level up to my coding abilities came out of learning to use git in a large organization, and all of those gains translated over to the solo use case as well.
Please talk about stash, that’s one feature I rely on heavily while working on multiple tasks and experimental features to jump between them without loosing my work
I guess this is kind of a funny anecdote, but when I first picked up a codebase at a company I worked for, there were credentials that were committed to the repository. So even though we eventually learned that this was bad and removed them, they were obviously still there due to it being a git repo. So when something really needs deleting you actually have to delete it from the repo entirely.
I just remembered the reason for the credentials files getting added to the repo. It's because the project used to be in SVN and then a company transferred the entire project to git and basically just dumped everything in lol
I'm really close to go from alpha to beta on my project and I want to do the release right. Can you give some solid tips on how to handle that? Like permissions, work flows, documentation, versioning and most important how to make sure a pull does not result in a broken install for a user because of a non updated dependency.
Is it bad practice to use branches instead of tags for different releases of your software? I typically branch from master to a branch release/version_xxx, make and test changes for the next version, and once complete merge back into master. That way I can simply check out a branch if I need to go and look at code from a previous release and master will always be the latest stable release. Should I be using tags instead?
Branches are good for development in progress. Once development is complete and a new release is ready, merge to master and tag latest commit on master. Plus, you can checkout tags in the same way as branches, so your workflow ends up unchanged.
@@nidalhaddad8652 Lol, I have an entire arch + dwm + St + Tmux + nvim rice. I just love it - I cannot imagine a day of work without my personal linux build, but I wanted to know his opinion on this.(oh, I use arch btw).
@@nidalhaddad8652 haha yeah. Well, as you said, it sure will be fun - but it's inevitable that you'll face a lot of issues setting it up(depending on your linux expertise). But, in the end, just the way you handle the entire desktop just as the way you built it to be is just one of the best feeling ever. RTFM, sub reddit, and a bit of frustration and determination is all it takes haha.
The reason Engineer did fetch instead of pull is to review the changes from remote in local repo before merging them, right? Thanks for anyone who responds.
Yes; as I understand it, imagine having a stack and a pointer, when you commit you add stuff to your local stack, but also move that pointer to that new element. If your remote stack is "ahead" (it has more commits than your repo) and you pull, you download the new elements AND move the pointer to the newest element- all that you didn't save will disappear. Now, if you use fetch, you download the new elements BUT your pointer (that HEAD word that you see in some commands) stays where it is. If you want to integrate it, you would merge it. TL;DR, "pull is fetching and merging" or "fetch as much as you want but think if you really want to pull". PS: sorry if the answer comes too late :P
My sister in laws facebook page was hacked and after getting it back he rehavked it. Had her setup 2FA on both Google account and her fb...google is fine, but she's got pictures of my baby nephew and he's saying he has "private pictures" and demanding money to give the account back! Is there anything you can do to punish this guy? He hid his face when I called her old account. Please help...for my nephews sake!
You probably noticed force pushing was an item but I didn't talk about it. I decided to cut it out since it was almost entirely described as a team development problem so I'll cover it there instead.
Alas, some of us who work sleepily at times find themselves working with a “team”: the sleepy and the rational, patient versions of themselves. Covering that topic may help people who, like me, often find that they are in fact working against themselves because they forgot to pull before they pushed at some point and got code out of sync somehow
Others: preparing slides
EM: .yaml
Man of culture
:wq
ZZ is fatser
I had barely any experience with source control until I joined a big tech company and was forced to learn to use git. Now, I can never go back, especially for solo projects. It helps me logically organize my work, focus on one task at a time, and have a clear history of everything I've ever done. It also encourages clean coding principles like separation of concerns, composition over inheritance, etc... Honestly, the single biggest level up to my coding abilities came out of learning to use git in a large organization, and all of those gains translated over to the solo use case as well.
Please talk about stash, that’s one feature I rely on heavily while working on multiple tasks and experimental features to jump between them without loosing my work
best content out there for people trying to learn
I guess this is kind of a funny anecdote, but when I first picked up a codebase at a company I worked for, there were credentials that were committed to the repository. So even though we eventually learned that this was bad and removed them, they were obviously still there due to it being a git repo. So when something really needs deleting you actually have to delete it from the repo entirely.
I just remembered the reason for the credentials files getting added to the repo. It's because the project used to be in SVN and then a company transferred the entire project to git and basically just dumped everything in lol
lol
Git is powerful as well as dangerous
thanks a lot for this one. thank you sir.
I'm really close to go from alpha to beta on my project and I want to do the release right.
Can you give some solid tips on how to handle that?
Like permissions, work flows, documentation, versioning and most important how to make sure a pull does not result in a broken install for a user because of a non updated dependency.
Great! Thanks!
Is it bad practice to use branches instead of tags for different releases of your software? I typically branch from master to a branch release/version_xxx, make and test changes for the next version, and once complete merge back into master. That way I can simply check out a branch if I need to go and look at code from a previous release and master will always be the latest stable release. Should I be using tags instead?
Branches are good for development in progress. Once development is complete and a new release is ready, merge to master and tag latest commit on master. Plus, you can checkout tags in the same way as branches, so your workflow ends up unchanged.
I really want to know your opinion on Linux ricing, tiling window managers and minimalism.
Try a small ricing if you gain in productivity go for it. If not forget about it.
@@nidalhaddad8652 Lol, I have an entire arch + dwm + St + Tmux + nvim rice. I just love it - I cannot imagine a day of work without my personal linux build, but I wanted to know his opinion on this.(oh, I use arch btw).
@@hemanthkotagiri8865 bro, and i thought that you wanted to try it. LooL
Nice. Ill go the arch way on my vacations. It will be a fun experience i hope
@@nidalhaddad8652 haha yeah. Well, as you said, it sure will be fun - but it's inevitable that you'll face a lot of issues setting it up(depending on your linux expertise). But, in the end, just the way you handle the entire desktop just as the way you built it to be is just one of the best feeling ever. RTFM, sub reddit, and a bit of frustration and determination is all it takes haha.
What’s the command for the merge after you’ve done git fetch?
Nice :D
The reason Engineer did fetch instead of pull is to review the changes from remote in local repo before merging them, right? Thanks for anyone who responds.
Yes; as I understand it, imagine having a stack and a pointer, when you commit you add stuff to your local stack, but also move that pointer to that new element. If your remote stack is "ahead" (it has more commits than your repo) and you pull, you download the new elements AND move the pointer to the newest element- all that you didn't save will disappear. Now, if you use fetch, you download the new elements BUT your pointer (that HEAD word that you see in some commands) stays where it is. If you want to integrate it, you would merge it. TL;DR, "pull is fetching and merging" or "fetch as much as you want but think if you really want to pull".
PS: sorry if the answer comes too late :P
Cool
My sister in laws facebook page was hacked and after getting it back he rehavked it. Had her setup 2FA on both Google account and her fb...google is fine, but she's got pictures of my baby nephew and he's saying he has "private pictures" and demanding money to give the account back! Is there anything you can do to punish this guy? He hid his face when I called her old account. Please help...for my nephews sake!
Do. not. push. to. production!
Also would be cool if you used main/production instead of master-branch
Bro make bot for zooba game plzzzz
This video promotes racism by using a master branch. /s
'Master' naming convention is kinda obsolete
use 'senpai' instead lol
Git is great for Linux kernel but a waste of time for the majority of solo projects