Fixing unescaped multiline string.

[sixtyfive]

Just getting rid of the deprecation message as it's been getting on my nerves.

Related to:

• Deprecate Multiline Sass Strings sass/sass#1302
• Backslash behaviour for line continuation sass/sass#1237
• Multiline strings with backslashes are silently truncated sass/libsass#942

• Commit message has a short title & issue references
  (Sorry, couldn't find an issue about this)

• Commits are squashed
  (There is only one)

• The build will pass (run bundle exec rake).

[tysongach]

For the sake of consistency, can we mimic how Bourbon does it and use two strings concatenated together with a +? Also, lining up Line 23 to 22 based on the first quotation marks?

[sixtyfive]

I implemented the changes per your wishes but didn't manage to successfully squash the two commits together (it was my first time to try and do so). I hope the fact that there's a merge now isn't too troublesome...

[tysongach]

@sixtyfive Try this:

git rebase -i HEAD~3

You’re editor should open, and you’ll see the three commits you’ve made with pick at the front of each line, for example:

pick bde6957 Fixing unescaped multiline string.
pick 9abc2cb Fixing unescaped multiline string.
pick c02a8e3 Merge branch 'master' of github.com:sixtyfive/neat

Change the last two picks to fixup, and save and close that file. That should leave you with one commit, the original, with the two later commits squashed into it. Then you can force push (git push --force) back up to GitHub.

[sixtyfive]

Not so, unfortunately :-(
(Basically the same thing that happened the first time I tried the rebase -i...)

[sixtyfive]

Tried to follow those instructions, ended up with another merge commit again. Sniff.

[sixtyfive]

@tysongach I think I'm making it worse. Right now it looks as if you probably just need to press a button behind "Resolve conflicts" so I'll leave it at this for now unless you have any instructions for what I should further do. Sorry for the hullabaloo.

[tysongach]

Ah, looks like you accidentally combined your commit with 2bde983 on master. No worries, I’ll get it fixed up for you and merged.

[tysongach]

Merged as 8bbdd4d.

[sixtyfive]

Thank you much! At least I learned that after a rebase you must push -f. Next time it'll hopefully work out fine.