Now, let's say someone has modified the master branch while you've been working on your branch and you need to pull those changes in. What you do is switch to the master branch (git checkout master), pull down the latest changes, (git pull), switch back to your branch (git checkout my-awesome-branch), and then merge in master (git merge master). Git is pretty good at merging, but if there is a conflict then you have to resolve them manually. Once you've resolved the conflicts, use 'git add' to stage and 'git commit' to commit. Don't forget to also 'git push' so 'my-awesome-branch' on origin is updated as well.
Never send a minion to do a god's work.
Glory ,'The Killer In Me'
Buffistechnology 3: "Press Some Buttons, See What Happens."
Got a question about technology? Ask it here. Discussion of hardware, software, TiVos, multi-region DVDs, Windows, Macs, LINUX, hand-helds, iPods, anything tech related. Better than any helpdesk!
Gudanov - Jun 05, 2019 10:26:29 am PDT #25285 of 25496
Coding and Sleeping
Gudanov - Jun 05, 2019 10:28:02 am PDT #25286 of 25496
Coding and Sleeping
A minor pitfall, is that git doesn't keep empty directories. So you may see people adding placeholder files in directories they want in git. ( '.keepit' is a popular name ).
Gudanov - Jun 05, 2019 10:30:26 am PDT #25287 of 25496
Coding and Sleeping
A very useful thing is .gitignore files. Files, directories, and wildcard names can be added to a '.gitignore' file in any directory of the source tree and any matching files will be ignored by git. Great for generated files or configuration files that shouldn't be shared.
Atropa - Jun 05, 2019 10:32:51 am PDT #25288 of 25496
The artist formerly associated with cupcakes.
I haven't used Git before, but from Gud's info, it's pretty similar to SourceDepot. So as long as I keep a cheat-sheet of the commands, I should be fine.
Gudanov - Jun 05, 2019 10:45:58 am PDT #25289 of 25496
Coding and Sleeping
There are also a ton of GUI clients for git. I like the ones that don't try to do too much so I know what git commands are getting issued. They are very useful for dealing with situations where you want to cherry-pick specific files for a commit or stuff like that. One client I really like is just the one built into Visual Studio Code: simple and straightforward. I also really like gitg but that might be a Linux only thing.
Gris - Jun 05, 2019 1:05:24 pm PDT #25290 of 25496
Hey. New board.
For GitHub specifically, the desktop GitHub app is pretty good too.
Emily - Jun 19, 2019 4:18:28 pm PDT #25291 of 25496
"In the equation E = mc⬧, c⬧ is a pretty big honking number." - Scola
I have used GitHub quite a lot but kind of forget every time I take a week or so away. I've found this very useful: [link]
Gudanov - Aug 19, 2019 5:11:20 pm PDT #25292 of 25496
Coding and Sleeping
My computer is pretty good at multitasking.
I just upgraded my computer and starting using it and things like GIMP starting instantly are happening now.
Jon B. - Aug 25, 2019 5:42:29 pm PDT #25293 of 25496
A turkey in every toilet -- only in America!
What hardware are you using, Gud? I've been thinking of upgrading myself.
Gudanov - Aug 26, 2019 4:07:35 am PDT #25294 of 25496
Coding and Sleeping
I just upgraded to a Ryzen 9 3900X which is a 12 core processor. Since I already had an AM4 socket motherboard (X390 chipset)all I had to do is pop in the new processor.