IRC log for #sourcefu, 2016-05-12

http://sourcefu.com

← Previous day | Channels | #sourcefu index | Today | Next day → | Search | Google Search | Plain-Text | plain, newest first | summary

All times shown according to UTC.

Time	S	Nick	Message
07:13			pdurbin joined #sourcefu
14:17		pdurbin	Is it possible to see what files are in merge conflict from the GitHub web interface? Or some other online tool? I always just attempt the merge locally and look at what the `git` command line tool tells me is conflicting.
14:27		pdurbin	This seems related: Resolve merge conflicts through the web interface. · Issue #200 · isaacs/github - https://github.com/isaacs/github/issues/200
18:46			Azgarech joined #sourcefu
18:46			Azgarech left #sourcefu

← Previous day | Channels | #sourcefu index | Today | Next day → | Search | Google Search | Plain-Text | plain, newest first | summary

http://sourcefu.com