|
I don't have an answer to your specific question, but I find handling git actions using Visual Studio's built-in git UI the easiest way to use git. I can do so much that I could never figure out by using git command-line.
There are no solutions, only trade-offs. - Thomas Sowell
A day can really slip by when you're deliberately avoiding what you're supposed to do. - Calvin (Bill Watterson, Calvin & Hobbes)
|
|
|
|
|
Following in google seems to return answers
GitHub Desktop add winmerge
|
|
|
|
|
I don't use GitHub Desktop, but according to their docs they say it'll install Git itself if it's not already installed. A quick and easy way to verify this is to go to a command prompt and type in git -v and see what you get.
As far as the WinMerge side, I'd be surprised if it shipped with git. But, GitHub Desktop does, so you should have it.
Jeremy Falcon
|
|
|
|
|
Oh worst case scenario, you may have to put GH Desktop's version of Git in your path. But, better than installing Git twice.
Jeremy Falcon
|
|
|
|
|
|
Does it do a 3-way merge?
Jeremy Falcon
|
|
|
|
|
No idea, I don't use GitHub Desktop myself, found this information by Googling.
|
|
|
|
|
feed the hamsters, please !!
CI/CD = Continuous Impediment/Continuous Despair
|
|
|
|
|
I am not seeing any issues with CodeProject. In fact, I am seeing fewer errors and alerts than normal.
What are the problems you are having with the site>
"Mistakes are prevented by Experience. Experience is gained by making mistakes."
|
|
|
|
|
I am getting a blnk page with some errors about logical stuff.
I'll make a screenshot next time, if I get it another time before going to bed
EDIT: No need. It has been already reported. Bugs and Suggestions[^]
I got it twice in the last 2 hours
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.
|
|
|
|
|
I too have been seeing this, randomly, several times today.
"the debugger doesn't tell me anything because this code compiles just fine" - random QA comment
"Facebook is where you tell lies to your friends. Twitter is where you tell the truth to strangers." - chriselst
"I don't drink any more... then again, I don't drink any less." - Mike Mullikins uncle
|
|
|
|
|
Found it. One of the servers is was taking a nap.
"Mistakes are prevented by Experience. Experience is gained by making mistakes."
|
|
|
|
|
When I first visited the site today I got this
Server Error in '/' Application.
Runtime Error
Description: An application error occurred on the server. The current custom error settings for this application prevent the details of the application error from being viewed remotely (for security reasons). It could, however, be viewed by browsers running on the local server machine.
Details: To enable the details of this specific error message to be viewable on remote machines, please create a <customErrors> tag within a "web.config" configuration file located in the root directory of the current web application. This <customErrors> tag should then have its "mode" attribute set to "Off".
<!-- Web.Config Configuration File >
<configuration>
<system.web>
<customErrors mode="Off"/>
</system.web>
</configuration>
Notes: The current error page you are seeing can be replaced by a custom error page by modifying the "defaultRedirect" attribute of the application's <customErrors> configuration tag to point to a custom error page URL.
<! Web.Config Configuration File -->
<configuration>
<system.web>
<customErrors mode="RemoteOnly" defaultRedirect="mycustompage.htm"/>
</system.web>
</configuration>
In a closed society where everybody's guilty, the only crime is getting caught. In a world of thieves, the only final sin is stupidity. - Hunter S Thompson - RIP
modified 17-Jul-24 3:16am.
|
|
|
|
|
Same - but now it is back... Can breathe again...
"It never ceases to amaze me that a spacecraft launched in 1977 can be fixed remotely from Earth." ― Brian Cox
|
|
|
|
|
It still happens periodically
In a closed society where everybody's guilty, the only crime is getting caught. In a world of thieves, the only final sin is stupidity. - Hunter S Thompson - RIP
|
|
|
|
|
ditto
I suspected Firefox, but when I switched to Edge no error. after a short while back to Firefox then OK.
"A little time, a little trouble, your better day"
Badfinger
|
|
|
|
|
That's funny this[^] is what I gotr.
A home without books is a body without soul. Marcus Tullius Cicero
PartsBin an Electronics Part Organizer - Release Version 1.4.0 (Many new features) JaxCoder.com
Latest Article: EventAggregator
|
|
|
|
|
You little devil Mike
In a closed society where everybody's guilty, the only crime is getting caught. In a world of thieves, the only final sin is stupidity. - Hunter S Thompson - RIP
|
|
|
|
|
I got the same this morning (temporarily), but only on Edge. Chrome worked fine.
|
|
|
|
|
Coincidence in your case. Does it on Chrome too, but it's intermittent.
Check out my IoT graphics library here:
https://honeythecodewitch.com/gfx
And my IoT UI/User Experience library here:
https://honeythecodewitch.com/uix
|
|
|
|
|
It is coming and going with such short intervals that the one minute it works on Edge but not on FireFox, the next minute it is the other way around.
If you try again, maybe Edge will work, but not Chrome.
Or maybe, at any given moment it will work, or fail, in all browsers, but since you cannot make both browsers make their requests at exactly the same time, what appears to be browser dependent is just a very fast state switch / fluctuation in the server.
It has been that way all day today. Revert to the basic loop: "While (failure) Try Again".
Religious freedom is the freedom to say that two plus two make five.
|
|
|
|
|
I was receiving the same earlier. Looks like I don't have voting or response buttons right now.
|
|
|
|
|
Looks like the response buttons are there again. Interesting - this response broke CSS.
|
|
|
|
|
Sort of back in but seeing "Upvote" and "Pin" against messages instead of the icons
Back to normal as soon as I clicked "Post" - interesting
|
|
|
|
|
It has been happening for at least 12 hours. And still happening.
|
|
|
|