зеркало из
https://github.com/iharh/notes.git
synced 2025-11-02 22:56:09 +02:00
5 строки
152 B
Plaintext
5 строки
152 B
Plaintext
qa
|
|
https://stackoverflow.com/questions/10697463/resolve-git-merge-conflicts-in-favor-of-their-changes-during-a-pull
|
|
|
|
git checkout --theirs path/to/file
|