|
Leveland, Texas- one of if not the flattest place I have ever been.
Truth or Consequences, New Mexico - was originally Hot Springs but changed it's name to that of the TV program.
Opp, Alabama
|
|
|
|
|
There is a place called Bitsch[^] (pronounced like in English without the "s")
|
|
|
|
|
For me, it averages about 1 to 2 times a month when I'm working on projects where everyone is branch and merge happy insane.
Marc
|
|
|
|
|
Branching is evil and should be avoided. In thirty years as a developer, I have never branched. (Nor have I ever used Git, so take that into account.)
|
|
|
|
|
PIEBALDconsult wrote: Branching is evil and should be avoided. In thirty years as a developer, I have never branched.
Exactly! And now, all of a sudden, it's branch, do work, commit, do a pull request, merge into "develop", delete branch.
WAF-PITA.
Marc
|
|
|
|
|
We recently upgraded from CVS to Mercurial, I did quite some research before choosing Mercurial over of Git, despite Git having much more inertia.
Major reason being how branches are handled.
Such a kludge as rebase should have been a major alarm bell going off afaic.
Note though that branching are different concepts in Git and Mercurial, something many people are missing out.
Git branches are more equivalent to bookmarks in Mercurial.
|
|
|
|
|
PIEBALDconsult wrote: Branching is evil and should be avoided. In thirty years as a developer, I have never branched. (Nor have I ever used Git, so take that into account.)
Interesting.
|
|
|
|
|
Quote: Branching is evil and should be avoided.
So how would you go about creating a new feature without affecting the rest of the code?
"There are two ways of constructing a software design: One way is to make it so simple that there are obviously no deficiencies, and the other way is to make it so complicated that there are no obvious deficiencies. The first method is far more difficult." - C.A.R. Hoare
Home | LinkedIn | Google+ | Twitter
|
|
|
|
|
We avoided branching for more than a year but it was foisted upon us by management (it's "best practice")
What I hate about branching in Git is that it looks like you lost work, especially if you are in branch A and create a new file then need to switch to branch B. All of the sudden the new file just disappears.
Linus can bite my butt, and all his sycophants too.
Give me back my file locking version control system. I work on files not an image of a directory structure.
|
|
|
|
|
MarkTJohnson wrote: I work on files not an image of a directory structure.
Hear! Hear!
|
|
|
|
|
Have you read The Git Book[^]?
Might help you (and anyone else who is merge insane [or not])
What do you get when you cross a joke with a rhetorical question?
The metaphorical solid rear-end expulsions have impacted the metaphorical motorized bladed rotating air movement mechanism.
Do questions with multiple question marks annoy you???
|
|
|
|
|
In two years of using GIT daily I have only done this once.
The way I manage merges is manually - I don't branch and everything that gets pushed up to the main GIT repository has to go through me.
This is possible where I work as there are only two of us.
When pushing live changes it is always me who pushes my repository to the master repository - my repository and the master repository are one and the same once I have pushed the changes live. All changes have to come through me and be QCd' by me.
I manage work on code by ensuring that we don't share the same code hence merges are very rare.
When there have been merges GIT just produces something rather horrible so I always incorporate the merge differences manually.
“That which can be asserted without evidence, can be dismissed without evidence.”
― Christopher Hitchens
|
|
|
|
|
Never happened to me...
Skipper: We'll fix it.
Alex: Fix it? How you gonna fix this?
Skipper: Grit, spit and a whole lotta duct tape.
|
|
|
|
|
"Branching" can be a PITA, but it is also a necessary PITA, when needed. I have found that the problems arise when someone on the team doesn't know how to branch and merge (SVN/GIT) or too many developers are working on the same project with the same files. Usually, the later.
|
|
|
|
|
Yeah that's insane.
The only time we (meaning myself and the woman I code with) ever branch is when we deploy a release to production. The code base gets merged from DEV, up to TEST, then up to MAIN and over to RELEASE. We then branch off of RELEASE so we can go back to any release version of the code we want.
We've never had to rebuild any repository. Amazing for a TFS server.
|
|
|
|
|
Dave Kreskowiak wrote: TFS server
Dave Kreskowiak wrote: The code base gets merged from DEV, up to TEST, then up to MAIN and over to RELEASE. We then branch off of RELEASE so we can go back to any release version of the code we want
You need to embrace Labels.
|
|
|
|
|
Let's see how long it lasts, I'm having a short attention span.
Twenty[^]
|
|
|
|
|
Got to 11. That was different.
"One man's wage rise is another man's price increase." - Harold Wilson
"Fireproof doesn't mean the fire will never come. It means when the fire comes that you will be able to withstand it." - Michael Simmons
"You can easily judge the character of a man by how he treats those who can do nothing for him." - James D. Miles
|
|
|
|
|
three great quotes from sig line. Upvote.
|
|
|
|
|
11, then 13.
Damnit. Now I've installed it on my tablet... 
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
|
|
|
|
|
They say it's easier on a tablet, but I'm a bit allergic to apps that demand in app purchases.
But I've gotten 18 using a mouse on the normal web site.
|
|
|
|
|
Ehm, you can make it yourself you know 
|
|
|
|
|
One try so far: 12, on my Droid.
I didn't see how tiles become linked and what to do about it when they do.
20 on first try with PC/mouse; third try overall.
modified 26-May-15 19:29pm.
|
|
|
|
|
Drop a matching value on one of the linked ones - that breaks its links.
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
|
|
|
|
|
17 so far, does it go to 20? What happens?
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
