|
I prefer to use git command line, but here's the VS extension.
The best resource for git info in general is Git-SCM.
|
|
|
|
|
The command line?! You're a much better man than me. I use the VS extension and would only research the command line if I was trying to do something that didn't appear to be supported within the extension or when using GitHub in the browser.
|
|
|
|
|
I agree
Real programmers use butterflies
|
|
|
|
|
It's pretty easy to be honest and there are a lot of things you can do that aren't supported in any Git software I've used (GitHub Desktop or VS) like rebase and stash.
Most of what is commonly done can be done using add, commit, merge, branch, status, push, and pull. Not even any complicated options or multiple parameters. To each their own though 
EDIT: Viewing branch histories is usually easier in graphical interfaces to be fair, but you can view that on GitHub or use git log --oneline --all --graph --decorate from the command line. I have an alias for it so I don't have to remember all that. Not as pretty as GitHub though.
modified 19-Mar-20 23:28pm.
|
|
|
|
|
Atlasian Sourcetree does both. Stashing is dead simple, the rebasing UI is confusing enough that I need to read the docs every 3-6 months when I need to do it. Which is a shame since in GUI app you should be able to indicate what you want to go where by dragging the first commit you want to move to its destination. For simple cases I just cherry pick in a manual point and click loop.
Did you ever see history portrayed as an old man with a wise brow and pulseless heart, weighing all things in the balance of reason?
Is not rather the genius of history like an eternal, imploring maiden, full of fire, with a burning heart and flaming soul, humanly warm and humanly beautiful?
--Zachris Topelius
Training a telescope on one’s own belly button will only reveal lint. You like that? You go right on staring at it. I prefer looking at galaxies.
-- Sarah Hoyt
|
|
|
|
|
Cool, I've never used that application before 
|
|
|
|
|
I'll describe the steps (somewhere in here you will get prompted for your github account credentials)
1. Open your solution
2. Right click on the solution in solution explorer, click Add To Source Control
3. Open the team explorer, click on the little home button, then click Sync
4. It will switch to options to publish, either to github, or azure. Click the first GitHub publish button
That should sync it for you. Any time you need to update, go to team explorer|home and then hit sync (you won't be prompted for repository information after the first time)
Finally, remember to commit periodically when you change stuff. It's best to do related changes together and then commit so your commit messages stay targeted to what you did. Make sure to sync to the server otherwise your copy remains local even though you committed
Real programmers use butterflies
|
|
|
|
|
honey the codewitch wrote: Make sure to sync to the server otherwise your copy remains local even though you committed
This is easily forgotten and is a PITA when you do.
- Push completed code to a branch on the server.
- On the server, merge that branch into the master branch.
- Delete the merged branch from the server and from your local copy.
- On your local copy, create a new branch from the master branch and push it to the server.
- Discover that your branch was created from the previous master, not the current one, because you forgot to synch with the new version of the master after step 3.
|
|
|
|
|
In general more than one branch complicates things. I understand it for large projects with teams and such but for my own stuff I simply don't branch. I just use master. *boo hiss*! (it's just easy and I'm lazy)
Real programmers use butterflies
|
|
|
|
|
I can see the advantage of that, but I often submit in stages when working on something, which is at odds with keeping the master branch stable in case someone wants to download the code.
|
|
|
|
|
Oh, I just use the "Releases" feature for that, and zip my code at any given state to publish as a release. 
Real programmers use butterflies
|
|
|
|
|
Maybe that's a better solution, but I haven't gotten around to reading the documentation yet.
|
|
|
|
|
You can fix this to varying degrees pretty easily on the command line:
If the branch is newly created or no conflicts are expected:
git merge master
You can also use this and just manually resolve conflicts if you really want.
If conflicts are expected and you know you want to keep your changes:
git merge -s ours master
If you've been working on something but haven't committed before realizing the problem:
git stash && git merge master && git stash pop
If you want a clean history without the additional master merge:
git rebase master
 
modified 20-Mar-20 1:30am.
|
|
|
|
|
Thanks you very much I'll give it a shot
"We can't stop here - this is bat country" - Hunter S Thompson - RIP
|
|
|
|
|
Githib and I have Tortoise Git on my machine so I can get visual UI and not need to worry about commands unless I truly screw up things.
Zen and the art of software maintenance : rm -rf *
Maths is like love : a simple idea but it can get complicated.
|
|
|
|
|
|
|
Finally, the answer has come!
It only took 20 years, the mark of a good question!
|
|
|
|
|
If so I was just wondering what sort of apps you've written or played with in order to use CUDA.
cheers
Chris Maunder
|
|
|
|
|
I played around a little with OpenCL and DirectCompute (when it was still fashionable), but not a direct CUDA API. I wouldn't know the first thing about that.
All I did was throw some contrived distributed problems at it.
Eventually I wanted to make some acoustic modeling Digital Signal Processing software using it to provide nice tube amp and analog synth sounds, or maybe go further and implement low latency real-time vocoding and such.
I never did though. Too much work and too much math.
Real programmers use butterflies
|
|
|
|
|
honey the codewitch wrote: too much math
Is that even a thing?? 
On a completely unrelated note: that syntax thingamajig you're building (sorry for getting technical...). Can that be adapted to guess what syntax it's looking at? I'm assuming not because I'm guessing you have to provide it the syntax rules (laborious?) for it to understand a syntax. What I was thinking was "does your syntax thingy load a syntax from a standard syntax description library and parse from that?"
I have a problem and am randomly looking around for a solution 
cheers
Chris Maunder
|
|
|
|
|
Chris Maunder wrote: What I was thinking was "does your syntax thingy load a syntax from a standard syntax description library and parse from that?"
Kind of. Glory takes a syntax description as a "grammar". The grammar itself is in XBNF format which is a lot like EBNF in terms of functionality but not as ugly.
Chris Maunder wrote: Can that be adapted to guess what syntax it's looking at?
It can't guess what it's looking at, nor can it change grammar rules on the fly (table regeneration would be too slow), but what it can do is return all possible variations of what it's looking at.
In order to get it to guess a grammar it would have to solve an undecidable problem, which is a problem. 
Real programmers use butterflies
|
|
|
|
|
honey the codewitch wrote: it would have to solve an undecidable problem
So what you're saying is it needs a marriage counsellor.
cheers
Chris Maunder
|
|
|
|
|
haha!
The problems crop up when trying divine hierarchies/trees of data from flat text.
Real programmers use butterflies
|
|
|
|
|
Chris Maunder wrote: I have a problem and am randomly looking around for a solution
let me introduce you your next secret weapon: Quick Answers[^] 
M.D.V.
If something has a solution... Why do we have to worry about?. If it has no solution... For what reason do we have to worry about?
Help me to understand what I'm saying, and I'll explain it better to you
Rating helpful answers is nice, but saying thanks can be even nicer.
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
