|
These are the most used git commands that I use (using TortoiseGIT):
push, pull, commit, merge, check-out, create branch.
Once you know them well, there's no need to learn all others.
I'd rather be phishing!
|
|
|
|
|
All you ever need to know about GIT[^]
Although, coming from TFS to GIT, as I did many moons ago, the Atlassian GIT tutorial was worth its weight in gold - really good and simple to follow
Local branches are great - just remember to rebase regularly so they don't get stale (rebase essentially crops your commits out of your branch, then puts any commits from the source branch into is, then puts your commits back on top of the updates....means you don't have huge merge problems when you integrate back into source)
C# has already designed away most of the tedium of C++.
|
|
|
|
|
It's not intuitive, but not all that complicated. It's a different mindset. For me, the best thing about Git is that it is a more "universal" system. It may be a little weaker in some ways at working with source code, but I can version anything with git. I put design docs, models, etc. in my project and it handles them just fine. With extensions like GitHub, I do collaborative design through pull requests.
|
|
|
|
|
I used TortoiseSVN before moving to git. It's weird and a bit nonsensical at first but it has reasons. Basically everything revolves around branching and merging[^]. Once those make sense everything else starts to fall into place.
Another[^] good article that might help. Patch branching to resolve conflicts will inevitably be useful to you at some point 
EDIT: To answer your question: The main reason you branch every new feature is to allow flexibility. For example, say you're coding a new feature. You get a call, "OMG, YOU NEED TO HOTFIX THIS PRODUCTION BUG ASAP, THINGS ARE BLOWING UP!!!" You can easily branch a hotfix, test it, and merge it to production. Your feature branch has had no impact on production yet. Now you go back to your feature branch, finish it, test it, then merge it into production. Easy. And yes, the hotfix is still there because git uses a 3-way merge (source, destination, ancestor). As long as the code the hotfix changed wasn't also changed in your feature branch, you won't have any issues. If it was you can use the patch branching technique to choose which code to keep.
modified 7-Jun-18 14:17pm.
|
|
|
|
|
I've gone through the same hassle, moving from SVN to Git.
Now I really wouldn't want to go back!
Branching and merging in Git is so much easier and faster.
Everything is local, which means you can mess around, create some branches, do your thing, before finally merging and sending it back to the server.
You just have to flip a mental switch.
Don't think of Git as a different SVN, think of it as something completely different with the same goal of collaborating and keeping a code history.
One tip, don't use Git using Visual Studio.
I use SourceTree instead and it makes working with Git a whole lot easier.
VS is somehow missing some basic Git functionality...
|
|
|
|
|
Confused ex-pupil who dined while holding American feline (10)
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
AntiTwitter: @DalekDave is now a follower!
|
|
|
|
|
OBFUSCATED
Old Boy = OB
Dined = F...ED
Holding US CAT
98.4% of statistics are made up on the spot.
|
|
|
|
|
Is the correct answer, and you are up tomorrow!
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
AntiTwitter: @DalekDave is now a follower!
|
|
|
|
|
Nice use of the 10 letter anagram red-herring by the way!
Andy B
|
|
|
|
|
I thought it might throw you all off, but no ... 
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
AntiTwitter: @DalekDave is now a follower!
|
|
|
|
|
Butt of many jokes, a hangover form the 80s, he always took it on the chin and laughed at himself.
Yeah, he was OK really.
|
|
|
|
|
I saw him on Mock the Week once, when he was being ribbed pretty hard. But he just smiled and took it all in good part.
|
|
|
|
|
He must have been a genuinely nice guy - think about it. He claimed to have slept with over 2000 women, and even in the current climate not one of them have come forward and said he forced them to do it or they didn't get the job ...
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
AntiTwitter: @DalekDave is now a follower!
|
|
|
|
|
Not to work, obviously. I have come to work a little earlier. I want to get some things done today.
Productivity killer number 1: Mickeysoft has updates. God help me.
Productivity killer number 2: Updates take their time.
Productivity killer number 3: Visual Studio has disappeared. All links are gone, now let's see what's left in the directories where it was installed...
Mickeysoft, keep your junk and just look for a nice place to die. This circus already has cost me almost an hour which I will certainly not get back from you.
I have lived with several Zen masters - all of them were cats.
His last invention was an evil Lasagna. It didn't kill anyone, and it actually tasted pretty good.
modified 7-Jun-18 7:22am.
|
|
|
|
|
CodeWraith wrote: Productivity killer number 3: Visual Studio has disappeared
you must have trust in the system, microsoft always knows what you need.... a holiday!
(Or perhaps a new career? somebody has to lean on the shovels at the road works, and sure as sh*t it's not going to be a ms AI bot - that'd be waste of good talent)
|
|
|
|
|
lopati: roaming wrote: microsoft always knows what you need
If they had any clue, Windows 10 would not even exist.
lopati: roaming wrote: Or perhaps a new career
Not again! If I had stayed with the first one, I might already look forward to retirement with a Captain's pension in a year or two. The second one did not last very long because I did not really like where it was going and now you want me to forget #3 just because buggy is the new quality at Mickeysoft? 
I have lived with several Zen masters - all of them were cats.
His last invention was an evil Lasagna. It didn't kill anyone, and it actually tasted pretty good.
|
|
|
|
|
CodeWraith wrote: If they had any clue, Windows 10 would not even exist.
So true. I used XP until 7 was released. I'll continue to use 7 until they stop trying to dumb down OS's and/or making them operate like a phone (10 was a compromise from 8 but compromise isn't what desktop owners want in my experience). If I want to use an elephanting phone, I'll use a phone 
|
|
|
|
|
Hi all,
I just opened a little coding challenge in Q&A
https://www.codeproject.com/Questions/1247344/Coding-challenge-just-for-fun
Have fun
Patrice
“Everything should be made as simple as possible, but no simpler.” Albert Einstein
|
|
|
|
|
So I'm currently a contractor who is employed at company A, but works for company B.
I need to login to my Microsoft account at A to fill in my hours, but I need to login to my Microsoft account at B to access their Azure environment.
And because I didn't have a VSTS account at B yet I've been hosting the code I wrote for B on my personal VSTS account C.
But because I also have a project for my own company I do have an Azure login for that customer D.
Logging in to any Microsoft service has become a real PITA.
At least I can still login to GitHub with a single account... Oh wait 
I did get a VSTS account for B today, so hopefully switching between B and C becomes a thing of the past as of tomorrow 
|
|
|
|
|
Welcome to modern life--A different user name for each site, and they don't have the same criteria for valid passwords, and also make you change your password every so often so that you cannot even maintain the same password for different systems.
|
|
|
|
|
I have this same problem and it is all managed by my C'YaPass app.
You never have to memorize a password again, but you can easily have a separate password for every site. I honestly use it every day numerous times at work. It's so much easier and better.
Please try my program, C'YaPass.
You can get the source code for every platform you can imagine at my GitHub :
GitHub - raddevus/CYaPassWF: Contains C# project for WinForm(WF) (Windows desktop) for CYaPass app[^]
You can get the installer for the WinForm version at: C'YaPass: Forget All Your Passwords | Get C'YaPass[^]
You can try the web version at: C'YaPass : Never type a password again[^]
The WinForm version is far better though because :
1. you can draw your password once (leave the app run)
2. each time you select your key for the site you want
3. it automatically copies your password to the clipboard so you can simply paste it.
Of course, there is much more to this password manager that does not save the passwords anywhere but generates them each time.
The generated passwords are SHA-256 hashes. Virtually as random as you can get.
It Remembers Password Requirements
The cool thing is that it remembers the sites password requirements like:
length
uppercase
special character
Here I made a really fast video (30 seconds) of how easy it is to use.
You'll see the app in action and then see the password pasted into Notepad++.
Also notice you draw one pattern but a different password is gen'd for each site.
http://cyapass.com/video/cyapassShort.mp4^
|
|
|
|
|
|
Ten minutes into the album and I already love where this is going
|
|
|
|
|
Well I guess that it makes it better to listen to that music when you are in your car on the expressway and you have not moved for an hour, but the traffic still does suck.
|
|
|
|
|
I listen to Jazz FM[^] when I'm on the road. It has a very calming influence on this old fart.
/ravi
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
