Refusing to merge unrelated histories. Resolve conflict git. conflicts git in visual studio. git конфликт слияния vs code пример заполнения. vs code how merge branch to current.