git cherry-pick没有结账?

时间:2015-11-17 16:58:53

标签: git cherry-pick git-cherry-pick

来自accepted answer at Merge, update, and pull Git branches without using checkouts

如果分支B导致非快进合并,则不能先将分支B合并到分支A中而不先检出A.这是因为需要一份工作副本来解决任何潜在的冲突。

我是否正确推断并说你也不能UPDATE companies SET companies.ic_dph = (SELECT financna_sprava.ic_dph FROM financna_sprava WHERE companies.nazov = financna_sprava.nazov), companies.mesto = (SELECT financna_sprava.mesto FROM financna_sprava WHERE companies.nazov = financna_sprava.nazov), companies.ulica_cislo = (SELECT financna_sprava.ulica_cislo FROM financna_sprava WHERE companies.nazov = financna_sprava.nazov), companies.psc= (SELECT financna_sprava.psc FROM financna_sprava WHERE companies.nazov = financna_sprava.nazov) 到未检出的目的地?

0 个答案:

没有答案