I have been unable to work out how to update my clone of the Gradle experiment at
https://github.com/vlsi/jmeter.git (branch gradle) $ git status Your branch and 'origin/gradle' have diverged, and have 28 and 69 different commits each, respectively. (use "git pull" to merge the remote branch into yours) [However, I have not made any local changes] I tried git pull, but that gave me lots of conflict warnings. I ended up having to clone the branch again, but that is quite slow, and is surely not necessary? S.
