search

UMM-CSci-3601 / intro-to-git

A group exercise practicing with various git ideas and tools
MIT License
2 stars 7 forks source link

Replace references to Slack with Discord #120

Closed NicMcPhee closed 10 months ago

NicMcPhee commented 10 months ago

There were only two, and I actually only replaced one of them. For the other, Slack was in a list of tools using Markdown, so it made sense to leave it, although I did actually add Discord as well.

Closes #117

NicMcPhee commented 10 months ago

My guess is that this will have a conflict with #119, but it should be pretty easy for me to resolve if git/GitHub can't do it for us.

NicMcPhee commented 10 months ago

Actually, we don't want to resolve that conflict – it's there as an example. I think that adding the leading spaces might be a "good" thing in that it still looks fine when you're reading the Markdown file, but GitHub might not try to interpret it as a conflict to be resolved?

kklamberty commented 10 months ago

Actually, we don't want to resolve that conflict – it's there as an example. I think that adding the leading spaces might be a "good" thing in that it still looks fine when you're reading the Markdown file, but GitHub might not try to interpret it as a conflict to be resolved?

I should have said that I was trying to mark that conflict as resolved. GitHub was not letting me merge it if I left it exactly as it was because it was seeing that as a conflict. Granted... I was editing it right in GitHub, so that may have looked different if I was editing it elsewhere. I added the spaces and left everything else as it was so that the example would be preserved as much as I could.

NicMcPhee commented 10 months ago

I think I'm kind of baffled, actually. I think everything is fine, though?