I have changes on my branch, and the Agent goes to update scripts and shows.
FastForwardError: A simple fast-forward merge was not possible.
This is not an issue, and I understand what's going on, but the problem is that agent will not pull in the scripts from the directory after this happens unless I go and hit "refresh".
It should handle this gracefully, show the error, and update the list of scripts as per usual.
