SQLServer
Merge origin/master