DNN-4959 - Added documentation for a number of static strings#67
DNN-4959 - Added documentation for a number of static strings#67donker wants to merge 2 commits intodnnsoftware:developmentfrom donker:locdocumentation
Conversation
|
Peter, I'm only seeing some binaries (dll) updates and csproj updates, so I think this will likely get rejected -you may want to check you created the right pull request.Thanks. |
|
@cathalconnolly, the second commit in this pull request should be ignored (the one with assemblies and whatnot). The first commit has so many changes to Localization.cs that GitHub won't show a diff, which is probably why you missed it. You'll have to pull it down locally to review. |
|
Yeah. The dlls are for WebAPI that is not present in the distribution and causes my build to fail. The changed csproj files I guess were changed without my knowledge by VS 2010. Note, after having gotten burned numerous times with VS addons and extensions, I am very conservative with this. It's pretty much a plain vanilla VS 2010 on a Win 7 machine. With all current updates. So the takeaway from this is that the pull request actually alerts you to my branch and not my commit. The commit was crafted to be exactly what I proposed. The later commit, as Brian noted, was just stashing stuff before resetting the work copy. So this part is confusing to me. Why would Git allow you to browse further down that branch? I guess I didn't fully understand. How does? ;-) |
|
pull requests are always for a branch, not a commit. this allows you to make changes easily based on discussions within the pull request |
|
OK, got it. Thanks, Brian. |
|
We willr eview this one once 7.2.2 is done and we move onto 7.3.0 |
|
This has been scheduled to be merged in our next 7.3.0 Sprint. |
|
I'm having issues with this - I've tried checking out the branch via the commandline but I think the problem is that the branch is a vs.net 2010 one, and I'm running vs.net 2013. I think I will extract the localization changes and manually merge them - this will mean that this pull request will be closed but the changes will be added (but unfortunately Peter will not get the credit for them) |
|
closing this pull request - I will manually merge the changes |
merge Peter Donkers pull request manually #67
…height-patch Temp fix Resource Manager default height
This is for a blogpost demo about using Git