Top > Git > Conflict

片側の変更だけ適用する方法

  • git checkout 
    git checkout --theirs
git checkout --ours

未整理

  • git rebase
  • git commit -i
Reload   Diff   Front page List of pages Search Recent changes Backup Referer   Help   RSS of recent changes
Last-modified: Fri, 10 May 2024 19:09:00 JST (10d)