|
223 | 223 | git status |
224 | 224 |
|
225 | 225 | and resolve any remaining conflicts. Resolving conflicts should normally be easy, but anything in``Unmerged paths`` may need attention: |
226 | | -* Files "deleted by us" indicate a stripped file has been changed. We don't care about those, so generally add them to the``git rm -fr`` line above, or``git rm -f`` them one by one. |
| 226 | +* Files "deleted by us" indicate a stripped file has been changed. We don't care about those, so generally add them to the``git rm -fr`` line above, or``git rm -f`` them one by one.To remove them all in one go on macOS or Linux,`git status | grep "deleted by us" | awk '{print $4}' | xargs git rm`. |
227 | 227 | * Outright conflicts will need work and may indicate some change in this repository hasn't yet gone back to``visualfsharp`` |
228 | 228 |
|
229 | 229 | One you're happy, commit any changes you needed to make |
|