ecker/tortoise-tts
4
6
Fork 15
Code Issues 9 Pull Requests 1 Packages Projects Releases Wiki Activity

git update error #11

New Issue
Closed
opened 2023-02-09 10:52:28 +00:00 by cplays · 1 comment
cplays commented 2023-02-09 10:52:28 +00:00
Copy Link

this

PS D:\tortoise-tts> git pull
error: Your local changes to the following files would be overwritten by merge:
        tortoise/api.py
        tortoise/utils/wav2vec_alignment.py
Please commit your changes or stash them before you merge.
Aborting
Updating d6b5d67..38ee19c
this ``` PS D:\tortoise-tts> git pull error: Your local changes to the following files would be overwritten by merge: tortoise/api.py tortoise/utils/wav2vec_alignment.py Please commit your changes or stash them before you merge. Aborting Updating d6b5d67..38ee19c ```
ecker commented 2023-02-09 13:40:21 +00:00
Owner
Copy Link

Try:

git fetch --all
git reset --hard origin/main

I added an update-force.bat that should do the above in commit d7443dfa06.

Try: ``` git fetch --all git reset --hard origin/main ``` I added an `update-force.bat` that should do the above in commit d7443dfa067e91ba30b55fc52a37f2445a2a6e20.
ecker closed this issue 2023-02-09 20:45:25 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: ecker/tortoise-tts#11
No description provided.
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?