|
Not certain, but that direction ensures a victory for the tortoise 
Also, reminds me of the title Hare Remover, from this Bugs Bunny episode...
Hare Remover (1946) - YouTube[^]
|
|
|
|
|
Be vewy vewy quiet, I'm hunting wabbits!
Message Signature
(Click to edit ->)
|
|
|
|
|
Fur crying out load, coney get any sillier?
| Ravings en masse^ |
|---|
| "The difference between genius and stupidity is that genius has its limits." - Albert Einstein | | "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 |
|
|
|
|
|
Not if it's a bald eagle swooping on them - then they're lunch!
Software Zen: delete this;
|
|
|
|
|
If it is a Dirty Dozen, which hare line are you referring to?
"If we don't change direction, we'll end up where we're going"
|
|
|
|
|
I Zeno way that could work. 
Freedom is the freedom to say that two plus two make four. If that is granted, all else follows.
-- 6079 Smith W.
|
|
|
|
|
If they line up in a V does it form a receding hare line with a widows pika?
Socialism is the Axe Body Spray of political ideologies: It never does what it claims to do, but people too young to know better keep buying it anyway. (Glenn Reynolds)
|
|
|
|
|
A man was driving along the highway, and saw a rabbit hopping across the middle of the road. He swerved to avoid hitting the rabbit, but unfortunately the rabbit jumped in front of the car and was hit. The driver, being a sensitive man as well as an animal lover, pulled over to the side of the road and got out to see what had become of the rabbit. Much to his dismay, the rabbit was dead. The driver felt so awful he began to cry.
A woman driving down the highway saw the man crying on the side of the road and pulled over. She stepped out of her car and asked the man what was wrong.
"I feel terrible," he explained. "I accidently hit this rabbit and killed it."
The woman told the man not to worry. She knew what to do. She went to her car trunk and pulled out a spray can. She walked over to the limp, dead rabbit, and sprayed the contents of the can onto the rabbit. Miraculously, the rabbit came to life, jumped up, waved its paw at the two humans and hopped down the road. 50 feet away the rabbit stopped, turned around, waved at the two again, hopped down the road another 50 feet, turned, waved, and hopped another 50 feet. The man was astonished. He couldn't figure out what substance could be in the woman's spray can! He ran over to the woman and demanded, " What was in your spray can? What did you spray onto that rabbit?" The woman turned the can around so that the man could read the label. It said:
"'Hare Spray' Restores Life to Dead Hare. Adds Permanent Wave."
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
-
Never argue with a fool. Onlookers may not be able to tell the difference.
Mark Twain
|
|
|
|
|
I thought hare spray was when you fired bunnies out of those T-shirt guns at the stadium!
Socialism is the Axe Body Spray of political ideologies: It never does what it claims to do, but people too young to know better keep buying it anyway. (Glenn Reynolds)
|
|
|
|
|
Is raising rabbits for meat a hare-raising experience?
|
|
|
|
|
We use a 3rd party web API that supplies a WSDL downloaded and set as a web reference in our .NET app, which is, itself, an internal web API compiled to a DLL. Like most good service providers, they have both sandbox and production environments, and the WSDL for each are different.
Our Git repo maintains at least two branches, dev and master, which naturally map to the 3rd party's sandbox and production.
We want these included in the Git repo so that the proper web reference is checked out with the associated branch. But this causes Git to whine about differences in the web reference files when we merge new changes from dev into master.
Is there a simple solution to this?
If you think 'goto' is evil, try writing an Assembly program without JMP.
|
|
|
|
|
Perhaps like so: put both WSDLs in both branches prod/wsdl test/wsdl. Select WSDL by build configuration?
"If we don't change direction, we'll end up where we're going"
|
|
|
|
|
Wouldn't that require dev and master code to use different web references, and shift the problem to the code files?
If you think 'goto' is evil, try writing an Assembly program without JMP.
|
|
|
|
|
Can't you just resolve the merge conflict using "yours\theirs"?
|
|
|
|
|
I don't know what the "yours/theirs" thing is. Can you explain?
If you think 'goto' is evil, try writing an Assembly program without JMP.
|
|
|
|
|
Most git clients allow you to resolve conflicts by either replacing the remote copy with your local one (resolve using yours) or to ignore your local copy and use the remote copy (resolve using theirs).
|
|
|
|
|
I'll look into this. I use the Git bash shell, and when the Git configuration references to WinMerge don't disappear, WinMerge.
If you think 'goto' is evil, try writing an Assembly program without JMP.
|
|
|
|
|
TNCaver wrote: they have both sandbox and production environments, and the WSDL for each are different.
Sounds like a poor design. The WSDL should be the same for both; you should just need to change the endpoint in the config file to switch between environments.
As it stands, you've got two completely different services. There's no guarantee that code written against one version will work against the other.
"These people looked deep within my soul and assigned me a number based on the order in which I joined."
- Homer
|
|
|
|
|
|
It may be poor design, I don't know. It's Salesforce, and I've been impressed by the design behind most of their stuff. It's not perfect, but it's very clever.
The differences are only in the user-customized pieces, and in the endpoint URL embedded in the WSDL.
If you think 'goto' is evil, try writing an Assembly program without JMP.
|
|
|
|
|
|
You could use a post-checkout hook to make sure the appropriate DLL based on the branch name is copied in from an external location.
I've never tried it but can't see why it wouldn't work?
|
|
|
|
|
Thanks, I'm still fairly new to Git, and didn't know about post-checkout hooks. This is promising!
If you think 'goto' is evil, try writing an Assembly program without JMP.
|
|
|
|
|
One solution might be a submodule.
Git submodules are versioned, so a branch can point at a specific version of the submodule (or, better yet, a specific branch or tag).
You could have your wsdl code in a submodule which you reference from the main repo. The dev branch references the submodule commit with the dev wsdl and the prod branch references the submodule commit with the live wsdl. When merging from dev into master, you could ignore the submodule (ie, use the "take mine" approach mentioned elsewhere in this thread). The advantage is that it's really easy to see which wsdl you're using, especially if you use branches, because a "git branch" in the submodule folder could show you, for instance:
* production
development
(meaning you have the production branch of the wsdl) -- in this way, you don't have to manually check the contents of the file, just that you're pointing at the correct branch.
|
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
