|
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.
|
|
|
|
|
|
I ran across a job advert (well TBH the advert ran across me [but that is beside the point]) for a freshly founded cloud based service where they are doing development in Java.
Does backend-Java strike you as fresh? I would say GoLang, C++, .Net and Scala are fresher but what is your opinion/impression?
"If we don't change direction, we'll end up where we're going"
|
|
|
|
|
Their former project was COBOL based.
BTW, C++ though heavily revamped, it is not exactly 'fresh'.
|
|
|
|
|
A language that can get as close to the hardware as C and as high level as ... well, C++, will never become stale. JavaScriptors avert your eyes.
I have lived with several Zen masters - all of them were cats.
His last invention was an evil Lasagna. It didn't kill anyone, and it actually tasted pretty good.
|
|
|
|
|
So, in your opinion, the C language is 'fresh', isn't it ?
|
|
|
|
|
And always will be.
I have lived with several Zen masters - all of them were cats.
His last invention was an evil Lasagna. It didn't kill anyone, and it actually tasted pretty good.
|
|
|
|
|
Amen. 
|
|
|
|
|
I did not mean the technical freshness of the language. I meant the use of the language [in a web backend].
"If we don't change direction, we'll end up where we're going"
|
|
|
|
|
megaadam wrote: Does backend-Java strike you as fresh?
No, it smells. Quite badly.
|
|
|
|
|
Yea well Jörgen...
’tis my spontaneous feeling as well. But I am going to some interview next week so...
"If we don't change direction, we'll end up where we're going"
|
|
|
|
|
Probably time to mention that I was thinking of Javascript, not Java.
Java doesn't reek, it merely has an unpleasant smell if you're not into it, a bit like the disinfection fluids they use at hospitals.
Some like it. I wouldn't say no to it if my current job was at a pig farm, but I would still prefer cinnamon buns. 
My company bought a startup last year, their backend is done in NodeJS. Now, that smells, and that's what I was thinking about.
The poor guys working on that pile of manure is patching the patchwork on a daily basis. Trying to refactor as they go.
It's a good thing that we don't do deadlines here.
|
|
|
|
|
Part 4 of adventure in Linux is to replace Windows 7 with a Linux NAS solution.
I installed OpenMediaVault and (as I already knew) it could see the four ntfs formatted partitions, but it couldn't do anything with them as far as monitoring for size/health. This is where the adventure started.
Because OVM takes over the box, I installed Lubuntu to make it easier to work on the drives.
My nefarious plan involved copying files from one of the drives at a time onto the 2tb drive i removed from the new Dell laptop, replace the ntfs partition with an ext4 partition, and copy the files back to the drive.
It took 2.5 hours to copy the files to the laptop drive, and I used gparted to remove the ntfs partition from the NAS drive, and re-partition/format it for ext4, but then I hit a wall. The drive's owner is root, and after some research, I discovered that I had to do sudo chown to change ownership on the drive.
After this initial setup, I can reinstall OVM, and then link my Kodi (home theater) box to it.
BTW, a number of years ago, I setup this box with FreeNAS, and it was fine until I went to update FreeNAS. The newer version of FreeNAS no longer supported NFS partitions. It pissed me off, and since I had to copy all of the ISOs all over again anyway, I installed Windows on the box. So that's where we are today.
".45 ACP - because shooting twice is just silly" - JSOP, 2010
-----
You can never have too much ammo - unless you're swimming, or on fire. - JSOP, 2010
-----
When you pry the gun from my cold dead hands, be careful - the barrel will be very hot. - JSOP, 2013
|
|
|
|
|
|
It turns out that I'm going to have to maintain a Windows VM so I can run DVDFab. There is no Linux equivalent/alternative to that application, although they did take a swing at a Linux version last year, but later abandoned the project. There was no reason cited for quitting that I could find.
".45 ACP - because shooting twice is just silly" - JSOP, 2010
-----
You can never have too much ammo - unless you're swimming, or on fire. - JSOP, 2010
-----
When you pry the gun from my cold dead hands, be careful - the barrel will be very hot. - JSOP, 2013
|
|
|
|
|
Entity Framework in agile environment - Design and Architecture Discussion Boards[^]
Was reading this thread. Just want to really know,
is there really someone who's using Code-first as the standard approach in their project?
I've been trying to do this, but somehow the team environment/people rushes towards DB first.
Even our boss is not so keen in getting to this
Is this something we should definitely aspire to achieve or it's okay to continue with DB first approach?
|
|
|
|
|
The bosses always wanted to push the application I am working on to code first. Newer parts work with EF, but there are also more than 20 year old parts that depend on stored procedures. We still need to make changes to the SPs and the data tables. One far away day, when the sun has used up most of its hydrogen and starts to cool down and collapse, we will finaly be rid of all these stored procedures and have EF and the database in a shape that will actually allow code first.
I have lived with several Zen masters - all of them were cats.
His last invention was an evil Lasagna. It didn't kill anyone, and it actually tasted pretty good.
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
