|
|
Welcome to git. git reset --hard is your friend, haha.
That, and just wiping the folder and doing a git clone again.
Personally, I find GUI tools like SmartGit/Hg to be very helpful, once I figured out (but now I don't remember) which branch to click on when I want to merge another branch in. That and figuring out how to integrate changes multiple people made to the same file. I can't believe we still use ++++ and VVVVV and ^^^^^ to designate changes, and who the hell remembers whether VVVV means my changes or your changes. F***ing archaic legacy from the Unix world. Oh wait...
Marc
|
|
|
|
|
Marc Clifton wrote: git reset --hard is your friend, haha.
Jep 
Marc Clifton wrote: That, and just wiping the folder and doing a git clone again.
Jep
Marc Clifton wrote: f***ing archaic legacy from the Unix world. Oh wait...
Jep 
|
|
|
|
|
GitHub app for windows isn't much better except it just does that "colleague changed a file" stuff for you without asking. The extra commit just shows up.
My new mantra has become:
Change branch
Pull
Create Commit
Pull
Sync Commit
Pull
Git is further proof that Linus doesn't like people.
|
|
|
|
|
So if we all dislike it, why do we use it? 
|
|
|
|
|
Are you Silver Box or Black box? Sorry, Apple or Windows (where I work all the PC's are black).
The Silver Box people love Git, the Black Box people not so much. But then Silver Box people like belonging to cults.
|
|
|
|
|
The View Toward M101 [^]
No chickens today - even with Dan Neely's addendum I still don't see a chicken. You could just as easily play connect the dots and make it look like anything. Anyway, let's not let that detract from the beauty of the universe.
|
|
|
|
|
Dang! I thought I was running my lightship in stealth mode! And the ionic drive must be on the fritz. Damn!
In other news, awesome picture!
Decrease the belief in God, and you increase the numbers of those who wish to play at being God by being “society’s supervisors,” who deny the existence of divine standards, but are very serious about imposing their own standards on society.-Neal A. Maxwell
You must accept 1 of 2 basic premises: Either we are alone in the universe or we are not alone. Either way, the implications are staggering!-Wernher von Braun
|
|
|
|
|
If a redhead gets a job as a baker, does that make him a ginger bread man?
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
|
|
|
|
|
That makes him a drummer.
"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
|
|
|
|
|
That was pretty funny. I liked that one. +5 for you...
I'm retired. There's a nap for that...
- Harvey
|
|
|
|
|
I was wondering who would get the reference. 
"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
|
|
|
|
|
As long as i don't have to put my bacon on a ginger beard then everythings fine 
Rules for the FOSW ![ ^]
if(this.signature != "")
{
MessageBox.Show("This is my signature: " + Environment.NewLine + signature);
}
else
{
MessageBox.Show("404-Signature not found");
}
|
|
|
|
|
If a (female) redhead gets a job as a baker I'd buy several kilograms of bread every day. One loaf each time.
GCS d--- s-/++ a- C++++ U+++ P- L- E-- W++ N++ o+ K- w+++ O? M-- V? PS+ PE- Y+ PGP t++ 5? X R++ tv-- b+ DI+++ D++ G e++>+++ h--- ++>+++ y+++* Weapons extension: ma- k++ F+2 X
If you think 'goto' is evil, try writing an Assembly program without JMP. -- TNCaver
"When you have eliminated the JavaScript, whatever remains must be an empty page." -- Mike Hankey
"just eat it, eat it"."They're out to mold, better eat while you can" -- HobbyProggy
|
|
|
|
|
Oh, snap![^]
Mongo: Mongo only pawn... in game of life.
|
|
|
|
|
Oh, dribble![^]
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
|
|
|
|
|
An excellent film[^]!
"These people looked deep within my soul and assigned me a number based on the order in which I joined."
- Homer
|
|
|
|
|
Forgot about that one. (Never saw it)
Mongo: Mongo only pawn... in game of life.
|
|
|
|
|
And does learning to bake cookies make a girl scout a brownie?
If you have an important point to make, don't try to be subtle or clever. Use a pile driver. Hit the point once. Then come back and hit it again. Then hit it a third time - a tremendous whack.
--Winston Churchill
|
|
|
|
|
Brown nose!
Mongo: Mongo only pawn... in game of life.
|
|
|
|
|
You're not going to get a rise out of me with a crumby pun - oven if you try again
| "The difference between genius and stupidity is that genius has its limits." - Albert Einstein | | "As far as we know, our computer has never had an undetected error." - Weisert | | "If you are searching for perfection in others, then you seek disappointment. If you are seek perfection in yourself, then you will find failure." - Balboos HaGadol Mar 2010 |
|
|
|
|
|
Well burn me!
Mongo: Mongo only pawn... in game of life.
|
|
|
|
|
Just a thought, but if he stored his wares in a timber structure at the bottom of his garden would it be a Redhead bread shed?
It goes without saying
|
|
|
|
|
OriginalGriff wrote: If a redhead gets a job as a baker, does that make him a ginger bread man?
Faarrrkkkk off you Welsh bastard. We're Ranga's and would be brewers or distillers, never bakers.
Michael Martin
Australia
"I controlled my laughter and simple said "No,I am very busy,so I can't write any code for you". The moment they heard this all the smiling face turned into a sad looking face and one of them farted. So I had to leave the place as soon as possible."
- Mr.Prakash One Fine Saturday. 24/04/2004
|
|
|
|
|
Resistance is voltage divided by the current.
The language is JavaScript. that of Mordor, which I will not utter here
This is Javascript. If you put big wheels and a racing stripe on a golf cart, it's still a f***ing golf cart.
"I don't know, extraterrestrial?"
"You mean like from space?"
"No, from Canada."
If software development were a circus, we would all be the clowns.
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
