|
We've been using git at work and after a few months of using it... it still drives me a bit mad.
For example: git pull origin branch
Should in theory be a specialized version of: git pull
...yet you end up in a weird limbo (now thinks your local is ahead of origin/branch) because the tracking pointer somehow doesn't get updated when you specify the branch (it does with the generic "git pull").
Anyone deal with git regularly? I keep finding some of these little inconsistencies that are driving me mad. I may just be partial to SVN since I used that for years but it seems like everything is overly complex for no good reason in git.
Don't get me started with hash values being used as commit identifiers. 
|
|
|
|
|
I completely agree. I may (very likely) be a dinosaur, but the particular use of git at one customer has me thinking of leaving.
TTFN - Kent
|
|
|
|
|
I believe the git developers have been quoted as saying their approach was, "if in doubt, do the opposite of what was done in SVN"... it seems like an absolutely idiotic approach to something. Instead of learning from the mistakes in the past, you're bound to invent new mistakes... that's what I see in git, completely new mistakes (innovative mistakes in design?  ).
|
|
|
|
|
Albert Holguin wrote: Don't get me started with hash values being used as commit identifiers
First they tried to use commit comments, but then they saw yours 
Ain't it weird? It was hacked together by a crazy egomaniac in an I'll-show-you all-nighter, so get in contact with the crazy egomanic I'll-show-you side of yours, and you'll be fine.
Here's the (at this point practically required) "Don't do that, then" - advise:
git fetch to update your local repo without making any other changes, then
git merge or git rebase to integrate your changes.
If the merge/rebase goes bonkers, you can always go back to "before limbo".
Srsly: Find a workflow that works. I found it pretty awkward that virtually every operation requires at least two commands, but you get used to it, then yo uget hooked on it.
|
|
|
|
|
peterchen wrote: I found it pretty awkward that virtually every operation requires at least two commands
That's where the git pull is supposed to come in... but when git pull <origin> <branch> gives you a different result than git pull.... it's just another hardly documented "feature".
By the way, I was doing the pull instead of the fetch/merge because it was for a repo that I hadn't changed locally, so I was just trying to sync with the origin.
|
|
|
|
|
I totally agree. I hate Git. I'll take SVN over Git any day! 
Anything that is unrelated to elephants is irrelephant
Anonymous
-----
The problem with quotes on the internet is that you can never tell if they're genuine
Winston Churchill, 1944
-----
I'd just like a chance to prove that money can't make me happy.
Me, all the time
|
|
|
|
|
What drives me mad about git is that you can't get a previous version of a single file pulled down into a separate directory to be able to look at the old code and the new code at the same time(or I haven't found the way at least). Comparing versions of files is sometimes very helpful in figuring out the bug.
Much rather prefer source control systems that work on files not directory structures like SubVersion or heaven forbid old school, file locking PVCS. With file locking I know no one can mess with my work and I know who I need to talk to in case the file I want is locked.
source code CONTROL system.
|
|
|
|
|
MarkTJohnson wrote: What drives me mad about git is that you can't get a previous version of a single file pulled down into a separate directory to be able to look at the old code and the new code at the same time(
We use ToroiseGit and it's trivial to Show Log, click the commit, right click the file that was changed and compare with the current.
(However this only gives you a quick shortcut to viewing files changed in a given commit, so some hunting will be required, but there is a search feature in the TortoiseGit Log window)
cheers
Chris Maunder
|
|
|
|
|
I have wondered what it was for quite a while, but the only scrum player I know here has brain damage from, evidently, too many in-game concussions, and can hardly explain the time of day.
This video (family safe) helped: [^].
«If you search in Google for 'no-one ever got fired for buying IBM:' the top-hit is the Wikipedia article on 'Fear, uncertainty and doubt'» What does that tell you about sanity in these times?
|
|
|
|
|
Thank you for that Bill! 
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
|
|
|
|
|
Far too coordinated for an Agile scrum.
(Actually I feel the better rugby analogies are ruck and maul[^])
|
|
|
|
|
|
That's very funny, and reminds me of some people I have worked with. thanks, Bill
«If you search in Google for 'no-one ever got fired for buying IBM:' the top-hit is the Wikipedia article on 'Fear, uncertainty and doubt'» What does that tell you about sanity in these times?
|
|
|
|
|
I guess this[^] is the highlight though.
|
|
|
|
|
I would call that a "deepest-dark" rather than a "highlight" ... definitely not for the whole family.
«If you search in Google for 'no-one ever got fired for buying IBM:' the top-hit is the Wikipedia article on 'Fear, uncertainty and doubt'» What does that tell you about sanity in these times?
|
|
|
|
|
My wife just sent me a laundry list of stress.
Right now we are beset by problems on every side.
My response: I think I like men.
Gotta help her keep things in perspective.
|
|
|
|
|
What's a "laundry list" ?
|
|
|
|
|
a todo list
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."
|
|
|
|
|
...that's dirty.
Jeremy Falcon
|
|
|
|
|
|
Well, some wives might feel like they had just been sent home from the front lines if their husband came out-of-the-closet, but I don't know about yours.
enjoy your new autonomous gender choice(s), Bill
«If you search in Google for 'no-one ever got fired for buying IBM:' the top-hit is the Wikipedia article on 'Fear, uncertainty and doubt'» What does that tell you about sanity in these times?
modified 25-Nov-14 10:27am.
|
|
|
|
|
Bill,
I know that we speak and write the same language but I wouldn't want my life to depend on successfully explaining stuff you write to a 3rd party.
Respectfully,
-MehGerbil
|
|
|
|
|
... Roaring fires, malt beer, ripe meat off the bone.
Well, my oven will have to do, but I do have a nice big steak and some (soon) fried potatoes.
And some malt beer. Have not drunk that stuff since I was little. Grandma always gave me some when the men were drinking beer 
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."
|
|
|
|
|
Dwarves are differently taller
|
|
|
|
|
Upvote for the title.
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
