# I am the Watcher. I am your guide through this vast new twtiverse.
#
# Usage:
# https://watcher.sour.is/api/plain/users View list of users and latest twt date.
# https://watcher.sour.is/api/plain/twt View all twts.
# https://watcher.sour.is/api/plain/mentions?uri=:uri View all mentions for uri.
# https://watcher.sour.is/api/plain/conv/:hash View all twts for a conversation subject.
#
# Options:
# uri Filter to show a specific users twts.
# offset Start index for quey.
# limit Count of items to return (going back in time).
#
# twt range = 1 8
# self = https://watcher.sour.is/conv/bipknia
@lukem Oh that's now even Github's fault! (_I don't thini!_) The default merge tools used in git are well umm just stupid. This happens more frequently than I can care to admit, and I've never really found a good merge tool that does it better? 😢
@lukem Oh that's now even Github's fault! (_I don't thini!_) The default merge tools used in git are well umm just stupid. This happens more frequently than I can care to admit, and I've never really found a good merge tool that does it better? 😢
@lukem Oh that's now even Github's fault! (_I don't thini!_) The default merge tools used in git are well umm just stupid. This happens more frequently than I can care to admit, and I've never really found a good merge tool that does it better? 😢
@prologic Yeah, I mistakenly blame GitHub out of habit as I do majority of my merges via web interface. Still, it makes ZERO sense to me haha.
@prologic Yeah, I mistakenly blame GitHub out of habit as I do majority of my merges via web interface. Still, it makes ZERO sense to me haha.
@lukem Of course! it’s absolutely silly that in 2020 merge tools still can’t get the most basic merge conflicts that have identical changes right! 😳
@lukem Of course! it’s absolutely silly that in 2020 merge tools still can’t get the most basic merge conflicts that have identical changes right! 😳
@lukem Of course! it’s absolutely silly that in 2020 merge tools still can’t get the most basic merge conflicts that have identical changes right! 😳