Closed charrea6 closed 9 years ago
Could you rebase this to get rid of the merge commit?
Don't think I can though I'm happy to be proved wrong! I've tried rebasing my repo but on attempting to push the changes to github there are rejected. Any ideas?
Out of curiosity why rebase instead of pull? I've not used the rebase command before.
To keep the history clean, a merge of master just doesn't look nice.
Thanks will ensure use of rebase/ffwd in future.
Not sure how it managed to work when I tested the previous change, but I'd missed this if statement. With this if statement still in, playback failed almost immediately. I can only assume that when I tested it no packets in the problem stream index where being sent.