update for branch "my-branch"
merge my-branch