search

Charcoal-SE / userscripts

Collection of userscripts that are used by/are useful to Charcoal.
https://charcoal-se.org/scripts
Apache License 2.0
28 stars 27 forks source link

Fire: Fix for #90 #132

Closed mvarendorff closed 6 years ago

mvarendorff commented 6 years ago

Now in it's own PR: This should provide a fix for images being displayed in code tags by escaping them.

makyen commented 6 years ago

Thanks for putting this in its own PR.

Another time, when you haven't yet pushed it to a public repository, it's cleaner to rebase your changes onto the head of the master branch, rather than merge the master into your branch. It also leaves more options open on our end. Being able to do so conveniently will depend on how extensive your changes are, but, it this case, it shouldn't have been an issue. When doing so, it should present a similar number of conflicts as a merge.

mvarendorff commented 6 years ago

I am not sure if I understood you correctly but if you mean that I shouldn't have resolved the conflicts, I just wanted to keep the amount of work for you low by providing a PR that can directly be merged.
As I have so far used git mostly as a code backup, I am very new on all the tools that git offers, so I gotta ask: What exactly should I have done differently? Just not merge the branches or something entirely different?

makyen commented 6 years ago

I appreciate your doing so.

Here is an article on the differences between rebase and merge: Merging vs. Rebasing

Don't worry about it for this PR.