Mark West
Mark West
@knocte - resolved conflicts that appeared, not sure about removing _ from private vars though and also whether to call async methods prefix, we normally remove that as you can...
@knocte not tested anything yet, was gonna wait till codebase is ready before doing that
@knocte that's fine :-), feel free to point out the stuff you see, will amend later after work
update event now gets triggered on each update, for test need to figure out how to read saved messages. Tasks. 1. Possibly add cancellation token to MainLoopAsync 2. Figure out...
@knocte where are these conflicts ?, updates work fine from what i can see when running for the last hr, have added cancellation token to methods, inside the main one...
@knocte i rebased to a previous commit on my branch to remove some information, did i need to rebase to master or something
think i resolved conflicts by rebasing thru GitBash to master, looks like VS2017 is not that good with GitHub, do not merge yet though until tested again
@knocte it is back working ok now - getting all updates coming through, was having problems earlier but run a send message test which gave me a socket error about...
@knocte are you able to check conflicts now, squashed commits using gitbash in the end rather than VS
@knocte have done the git commands specified, says branch is up to date and rebased to your master as asked.