Click here to Skip to main content
15,914,594 members

Welcome to the Lounge

   

For discussing anything related to a software developer's life but is not for programming questions. Got a programming question?

The Lounge is rated Safe For Work. If you're about to post something inappropriate for a shared office environment, then don't post it. No ads, no abuse, and no programming questions. Trolling, (political, climate, religious or whatever) will result in your account being removed.

 
GeneralRe: Git Your Web Reference Pin
TNCaver11-Oct-18 5:23
TNCaver11-Oct-18 5:23 
GeneralRe: Git Your Web Reference Pin
Richard Deeming11-Oct-18 5:39
mveRichard Deeming11-Oct-18 5:39 
PraiseRe: Git Your Web Reference Pin
Jörgen Andersson11-Oct-18 8:32
professionalJörgen Andersson11-Oct-18 8:32 
GeneralRe: Git Your Web Reference Pin
TNCaver11-Oct-18 9:24
TNCaver11-Oct-18 9:24 
GeneralRe: Git Your Web Reference Pin
RickZeeland11-Oct-18 6:39
mveRickZeeland11-Oct-18 6:39 
GeneralRe: Git Your Web Reference Pin
punkyguy11-Oct-18 21:40
punkyguy11-Oct-18 21:40 
GeneralRe: Git Your Web Reference Pin
TNCaver12-Oct-18 6:51
TNCaver12-Oct-18 6:51 
GeneralRe: Git Your Web Reference Pin
Davyd McColl12-Oct-18 0:37
Davyd McColl12-Oct-18 0:37 
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.
GeneralRe: Git Your Web Reference Pin
englebart12-Oct-18 2:17
professionalenglebart12-Oct-18 2:17 
QuestionIs it just me? Pin
megaadam11-Oct-18 3:43
professionalmegaadam11-Oct-18 3:43 
AnswerRe: Is it just me? Pin
CPallini11-Oct-18 3:52
mveCPallini11-Oct-18 3:52 
GeneralRe: Is it just me? Pin
CodeWraith11-Oct-18 3:55
CodeWraith11-Oct-18 3:55 
QuestionRe: Is it just me? Pin
CPallini11-Oct-18 4:57
mveCPallini11-Oct-18 4:57 
AnswerRe: Is it just me? Pin
CodeWraith11-Oct-18 5:11
CodeWraith11-Oct-18 5:11 
GeneralRe: Is it just me? Pin
CPallini11-Oct-18 5:37
mveCPallini11-Oct-18 5:37 
GeneralRe: Is it just me? Pin
megaadam11-Oct-18 3:57
professionalmegaadam11-Oct-18 3:57 
AnswerRe: Is it just me? Pin
Jörgen Andersson11-Oct-18 8:35
professionalJörgen Andersson11-Oct-18 8:35 
GeneralRe: Is it just me? Pin
megaadam11-Oct-18 11:29
professionalmegaadam11-Oct-18 11:29 
GeneralRe: Is it just me? Pin
Jörgen Andersson11-Oct-18 19:29
professionalJörgen Andersson11-Oct-18 19:29 
GeneralLinux NAS Pin
#realJSOP11-Oct-18 2:48
professional#realJSOP11-Oct-18 2:48 
GeneralRe: Linux NAS Pin
OriginalGriff11-Oct-18 4:16
mveOriginalGriff11-Oct-18 4:16 
GeneralRe: Linux NAS Pin
#realJSOP11-Oct-18 4:21
professional#realJSOP11-Oct-18 4:21 
GeneralCode First Pin
R191111-Oct-18 0:36
R191111-Oct-18 0:36 
GeneralRe: Code First Pin
CodeWraith11-Oct-18 0:45
CodeWraith11-Oct-18 0:45 
GeneralRe: Code First Pin
Gerry Schmitz12-Oct-18 3:28
mveGerry Schmitz12-Oct-18 3:28 

General General    News News    Suggestion Suggestion    Question Question    Bug Bug    Answer Answer    Joke Joke    Praise Praise    Rant Rant    Admin Admin   

Use Ctrl+Left/Right to switch messages, Ctrl+Up/Down to switch threads, Ctrl+Shift+Left/Right to switch pages.