how to update local code
branch dev test
add my test
me test
resolve conflict