... | ... | @@ -8,6 +8,12 @@ stages new and modified, but does not delete |
|
|
##### `git add -u`
|
|
|
stages modified and deleted, but not new, `git add myfile.cpp`: will only add that file).
|
|
|
|
|
|
## git accept theirs version of conflict
|
|
|
```
|
|
|
git checkout --theirs <file-path>
|
|
|
git add <file-path>
|
|
|
git commit
|
|
|
```
|
|
|
|
|
|
## Useful links
|
|
|
https://www.git-tower.com/blog/git-for-subversion-users-cheat-sheet/
|
... | ... | |