Closed ncsmikewoods closed 6 years ago
Whoa not sure what happened with this commit log... There are changes in here that you've already merged. If this is problematic for you to merge in let me know and I'll see what I can do to clean it up.
Looks like you pulled in the previous commits with a merge from our master. If you want to avoid it you can either re-fork or the better approach is to re-base your changes above the merge (although that might be harder to unpick now). The only new change is commit 02baec9
correct? If so I can probably review around that for now.
That's correct. Sorry about the mess.
I'm pretty sure I got merge happy one day and wasn't paying close enough attention to what you had pulled in. Oops.
No problem, I appreciate all the efforts you are making with these PR's in the first place!
On this issue, I will rush it in now as it's fairly critical! As some background: previously both URLs (prod or US) were valid. I chose prod for consistency. It looks like the prod variant is internal only or has been decomissioned. Git should be smart enough to omit previously encountered commits (though the merges will probably still be there).
Doing a squash merge to hopefully minimise noise on master
@ncsmikewoods I'm not sure if it is visible externally but the network graph for the repo certainly got more colourful with this branch! https://github.com/experianplc/experian-dotnet/network :)
Looks like there might have just been a copy/paste mistake on the prod URL. It doesn't appear to actually have
prod-
in there.