Link to Git guide in rustc-dev-guide on merge conflicts

[camelid]

Dependent on rust-lang/rustc-dev-guide#890 being merged, so this is draft.

That PR was merged, so this is ready!

[jyn514]

@Mark-Simulacrum can we get this merged? I think it would be really helpful.

[Mark-Simulacrum]

Why are there noqa trailers? Do they mean something?

[jyn514]

Looks like https://stackoverflow.com/questions/45346575/what-does-noqa-mean-in-python-comments. Not sure why @camelid added them.

[camelid]

I didn’t understand them either when I first looked at this code :)

CI fails if you have a line longer than 79 chars without “noqa”, and it’s hard to keep the lines short for these messages. (“noqa” tells the linter to ignore the line.) I assume “noqa” stands for “no quality assurance” or something.

[Mark-Simulacrum]

I think fixing CI shouldn't be too hard, could you try to do that? It feels odd to only do it here.

[camelid]

This spot had noqa before I worked on, but I agree that it’s kind of annoying. By “fix CI” do you mean increase the line length limit or something else?

[Mark-Simulacrum]

I don't see noqa in the lines removed? Anyway, not worth fighting about, let's just merge it in.

[camelid]

I changed the code a few weeks ago and was able to remove noqa (the line was 130 chars or something like that before). But the link alone is longer than the limit here, and it doesn’t seem worth splitting up to satisfy the linter since I think it’s confusing to see it on multiple lines.