Open
Conversation
Updates SQL where statement for acquiring Lead Agency information
updated install / uninstall for 10.5 and 10.6
Added error checking in case text objects were missing or replaced on the template layout.
This reverts commit 6d604d8.
This reverts commit 4cf2dae.
This reverts commit 13c1560.
This reverts commit 3b9a37d.
This commit re-introduces four problem commits that had to be reverted, but does so without introducing wierd whitespace errors.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The last four commits on master were done from Windows files (with CRLF line endings) and were uploaded directly to GitHub using the "Upload Files" button instead of git add/commit/push operations. As such, git is having severe problems on checkout --- as soon as the files are checked out, the line endings are automatically changed again, and then git claims they're modified, uncommitted files.
This automatic line end conversion thing means that git won't let you change branches without saving these changes --- and even if you do, when you change back to the master branch, you get the same conversion problem again.
This pull request fixes up those problems by reverting the four commits with whitespace problems, then re-doing them without the CRLF line endings.
I described the exact process for doing this in an email to Don, but this was the process:
The result is that we recreate, one by one, the effect of the four problem commits, without introducing the same whitespace problems (diff -b and patch -l are the key here).
If you now do "git diff -b fix-whitespace master" (ignoring whitespace) you'll see no differences, but if you leave off the -b you'll see tons of differences.