|
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?
|
|
|
|
|
You get to meet the President 
|
|
|
|
|
Well, the highest I got so far is 20. When you reach 20, that '20' tile is removed form the board.
|
|
|
|
|
17 on my first try. Meh.
Did you ever see history portrayed as an old man with a wise brow and pulseless heart, waging 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
|
|
|
|
|
|
Somehow this reminds me of a recent attention span test.
In 2000, the average attention span was 12 seconds. When
the test was repeated again in 2015, it was down to 8.25.
Goldfish however, remain the same at 9 seconds.
73
|
|
|
|
|
Would Mensa commandos be a SWOT team?
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
|
|
|
|
|
No, just tedious, same as the rest of them.
Some men are born mediocre, some men achieve mediocrity, and some men have mediocrity thrust upon them.
|
|
|
|
|
I know what you mean...for people so apparently bright, I've yet to meet one I'd want to spend time with...
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
|
|
|
|
|
How many HAVE you met? 
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
|
|
|
|
|
Not that many - couple of dozen or so. Mostly because I have tended to avoid them after the first dozen... 
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
|
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
