Skip to content

Instantly share code, notes, and snippets.

@jvloo

jvloo/git-fix-untracked-files-overwritten-by-merge.md

Last active August 28, 2021 16:30
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save jvloo/8a7617673ce38b19e3fe3b2c632cf6ac to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save jvloo/8a7617673ce38b19e3fe3b2c632cf6ac to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. Xavier Loo revised this gist Aug 28, 2021. 1 changed file with 2 additions and 4 deletions.
    6 changes: 2 additions & 4 deletions git-fix-untracked-files-overwritten-by-merge.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,7 +1,5 @@
    Track all files, remove all of the local changes to those files,
    and then get the files from the remote origin.

    https://stackoverflow.com/a/26639255/11690179
    - Error: The following untracked working tree files would be overwritten by merge. Please move or remove them before you merge.
    - Solution: Track all files, remove all of the local changes to those files, and then get the files from the remote origin. (https://stackoverflow.com/a/26639255/11690179)

    ```
    git add *
  2. Xavier Loo renamed this gist Aug 28, 2021. 1 changed file with 0 additions and 0 deletions.
    0 git-fix.md → ...x-untracked-files-overwritten-by-merge.md
    View file
    File renamed without changes.
  3. Xavier Loo created this gist Aug 28, 2021.
    10 changes: 10 additions & 0 deletions git-fix.md
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,10 @@
    Track all files, remove all of the local changes to those files,
    and then get the files from the remote origin.

    https://stackoverflow.com/a/26639255/11690179

    ```
    git add *
    git stash
    git pull
    ```