Skip to content

Instantly share code, notes, and snippets.

View Web socket load test with jmeter
This guide helps to test websocket load test with jmeter.
Github has the code and jar file to test
pontiyaraja / Git conflict
Created Jan 28, 2016
Resolve git conflict in command line
View Git conflict
Step 1: From your project repository, bring in the changes and test.
git fetch origin
git checkout -b server origin/server
git merge master
Step 2: Merge the changes and update on GitHub.
git checkout master
git merge --no-ff server