jmeter-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebb <>
Subject [git] How to update local clone of vlsi/jmeter/gradle
Date Sun, 10 Mar 2019 11:50:32 GMT
I have been unable to work out how to update my clone of the Gradle
experiment at (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?


View raw message