manually merge PRs which failed to auto-merge

[milahu]

pull index 2 of 27
original PR: https://github.com/Uberi/speech_recognition/pull/592
title: Update __init__.py because I want vosk to function like google API
author: Nathius262
head_repo_name: speech_recognition
head_repo_owner: Nathius262
head_ref: offline-recognition
head_sha: 467224e845e9b6ef25bef84494bd240d58429933
base_sha: 481f18b877b72af31d9d07ec78ff1c5321c1aeaa
+ git fetch Uberi offline-recognition
From https://github.com/Uberi/speech_recognition
 * branch            offline-recognition -> FETCH_HEAD
+ git remote add Nathius262 https://github.com/Nathius262/speech_recognition
error: remote Nathius262 already exists.
+ true
+ git fetch Nathius262 offline-recognition
From https://github.com/Nathius262/speech_recognition
 * branch            offline-recognition -> FETCH_HEAD
+ git checkout master
Already on 'master'
Your branch is up to date with 'origin/master'.
+ git branch merge-Uberi-pr592-467224e-Update-__init__py-because-I-want-vosk-to-function-like-google-API-by-Nathius262
+ git switch merge-Uberi-pr592-467224e-Update-__init__py-because-I-want-vosk-to-function-like-google-API-by-Nathius262
Switched to branch 'merge-Uberi-pr592-467224e-Update-__init__py-because-I-want-vosk-to-function-like-google-API-by-Nathius262'
+ git merge Nathius262/offline-recognition -m 'merge branch Nathius262/offline-recognition'
Auto-merging speech_recognition/__init__.py
CONFLICT (content): Merge conflict in speech_recognition/__init__.py
Recorded preimage for 'speech_recognition/__init__.py'
Automatic merge failed; fix conflicts and then commit the result.
+ git merge --abort
failed to auto-merge PR 592 -> skip



pull index 6 of 27
original PR: https://github.com/Uberi/speech_recognition/pull/554
title: Updated python example for Microsoft Azure Speech API
author: anthonymiyoro
head_repo_name: null
head_repo_owner: null
head_ref: patch-1
head_sha: 53ae65cd54c555fc613de50d73b5880a2568873b
base_sha: c89856088ad81d81d38be314e3db50905481c5fe
FIXME head branch was deleted? -> skip PR



pull index 9 of 27
original PR: https://github.com/Uberi/speech_recognition/pull/517
title: Improved Docs
author: Swagnikdhar
head_repo_name: speech_recognition
head_repo_owner: Swagnikdhar
head_ref: master
head_sha: 8ddc631b238f07443054866ecaab8ca9746d7980
base_sha: c89856088ad81d81d38be314e3db50905481c5fe
error: no such commit 8ddc631b238f07443054866ecaab8ca9746d7980
+ git fetch Uberi master
From https://github.com/Uberi/speech_recognition
 * branch            master     -> FETCH_HEAD
+ git remote add Swagnikdhar https://github.com/Swagnikdhar/speech_recognition
+ git fetch Swagnikdhar master
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), 9.19 KiB | 672.00 KiB/s, done.
From https://github.com/Swagnikdhar/speech_recognition
 * branch            master     -> FETCH_HEAD
 * [new branch]      master     -> Swagnikdhar/master
+ git checkout master
Already on 'master'
Your branch is up to date with 'origin/master'.
+ git branch merge-Uberi-pr517-8ddc631-Improved-Docs-by-Swagnikdhar
+ git switch merge-Uberi-pr517-8ddc631-Improved-Docs-by-Swagnikdhar
Switched to branch 'merge-Uberi-pr517-8ddc631-Improved-Docs-by-Swagnikdhar'
+ git merge Swagnikdhar/master -m 'merge branch Swagnikdhar/master'
Auto-merging README.rst
CONFLICT (content): Merge conflict in README.rst
Recorded preimage for 'README.rst'
Automatic merge failed; fix conflicts and then commit the result.
+ git merge --abort
failed to auto-merge PR 517 -> skip



pull index 17 of 27
original PR: https://github.com/Uberi/speech_recognition/pull/434
title: Fixed IBM call to use api key.
author: chrisspen
head_repo_name: speech_recognition
head_repo_owner: chrisspen
head_ref: master
head_sha: 5fce29e783d699b3b29af64b5a031287595162bd
base_sha: c89856088ad81d81d38be314e3db50905481c5fe
error: no such commit 5fce29e783d699b3b29af64b5a031287595162bd
+ git fetch Uberi master
From https://github.com/Uberi/speech_recognition
 * branch            master     -> FETCH_HEAD
+ git remote add chrisspen https://github.com/chrisspen/speech_recognition
+ git fetch chrisspen master
remote: Enumerating objects: 39, done.
remote: Counting objects: 100% (33/33), done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 39 (delta 26), reused 33 (delta 26), pack-reused 6
Unpacking objects: 100% (39/39), 39.15 KiB | 409.00 KiB/s, done.
From https://github.com/chrisspen/speech_recognition
 * branch            master     -> FETCH_HEAD
 * [new branch]      master     -> chrisspen/master
+ git checkout master
Already on 'master'
Your branch is up to date with 'origin/master'.
+ git branch merge-Uberi-pr434-5fce29e-Fixed-IBM-call-to-use-api-key-by-chrisspen
+ git switch merge-Uberi-pr434-5fce29e-Fixed-IBM-call-to-use-api-key-by-chrisspen
Switched to branch 'merge-Uberi-pr434-5fce29e-Fixed-IBM-call-to-use-api-key-by-chrisspen'
+ git merge chrisspen/master -m 'merge branch chrisspen/master'
Auto-merging speech_recognition/__init__.py
Auto-merging setup.py
CONFLICT (content): Merge conflict in setup.py
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Recorded preimage for '.gitignore'
Recorded preimage for 'setup.py'
Automatic merge failed; fix conflicts and then commit the result.
+ git merge --abort
failed to auto-merge PR 434 -> skip



pull index 22 of 27
original PR: https://github.com/Uberi/speech_recognition/pull/347
title: Added model parameter for Google Cloud Speech API
author: jhoelzl
head_repo_name: speech_recognition
head_repo_owner: jhoelzl
head_ref: patch-8
head_sha: b9411fdc0db55096ccf4f5697b94c97edce66e9e
base_sha: 19dc36eb6a6173b500e2cc8cf2161ea2fe8cb891
error: no such commit b9411fdc0db55096ccf4f5697b94c97edce66e9e
+ git fetch Uberi master
From https://github.com/Uberi/speech_recognition
 * branch            master     -> FETCH_HEAD
+ git remote add jhoelzl https://github.com/jhoelzl/speech_recognition
+ git fetch jhoelzl patch-8
remote: Enumerating objects: 16, done.
remote: Counting objects: 100% (11/11), done.
remote: Total 16 (delta 11), reused 11 (delta 11), pack-reused 5
Unpacking objects: 100% (16/16), 21.75 KiB | 116.00 KiB/s, done.
From https://github.com/jhoelzl/speech_recognition
 * branch            patch-8    -> FETCH_HEAD
 * [new branch]      patch-8    -> jhoelzl/patch-8
+ git checkout master
Already on 'master'
Your branch is up to date with 'origin/master'.
+ git branch merge-Uberi-pr347-b9411fd-Added-model-parameter-for-Google-Cloud-Speech-API-by-jhoelzl
+ git switch merge-Uberi-pr347-b9411fd-Added-model-parameter-for-Google-Cloud-Speech-API-by-jhoelzl
Switched to branch 'merge-Uberi-pr347-b9411fd-Added-model-parameter-for-Google-Cloud-Speech-API-by-jhoelzl'
+ git merge jhoelzl/patch-8 -m 'merge branch jhoelzl/patch-8'
Auto-merging speech_recognition/__init__.py
CONFLICT (content): Merge conflict in speech_recognition/__init__.py
Auto-merging reference/library-reference.rst
Recorded preimage for 'speech_recognition/__init__.py'
Automatic merge failed; fix conflicts and then commit the result.
+ git merge --abort
failed to auto-merge PR 347 -> skip



pull index 24 of 27
original PR: https://github.com/Uberi/speech_recognition/pull/288
title: Feature Add: hotword/wake word detection can be done in the background
author: josh-hernandez-exe
head_repo_name: speech_recognition
head_repo_owner: josh-hernandez-exe
head_ref: listen-background-with-hotword-detection
head_sha: 0cf525fb783f844a2774ab3e6ffd8d12ceca61d3
base_sha: 64f844ee645b0b6837aa0c83ce55cb7ddbcc1ad9
error: no such commit 0cf525fb783f844a2774ab3e6ffd8d12ceca61d3
+ git fetch Uberi master
From https://github.com/Uberi/speech_recognition
 * branch            master     -> FETCH_HEAD
+ git remote add josh-hernandez-exe https://github.com/josh-hernandez-exe/speech_recognition
+ git fetch josh-hernandez-exe listen-background-with-hotword-detection
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (3/3), done.
remote: Total 4 (delta 3), reused 3 (delta 3), pack-reused 1
Unpacking objects: 100% (4/4), 12.93 KiB | 1018.00 KiB/s, done.
From https://github.com/josh-hernandez-exe/speech_recognition
 * branch            listen-background-with-hotword-detection -> FETCH_HEAD
 * [new branch]      listen-background-with-hotword-detection -> josh-hernandez-exe/listen-background-with-hotword-detection
+ git checkout master
Already on 'master'
Your branch is up to date with 'origin/master'.
+ git branch merge-Uberi-pr288-0cf525f-Feature-Add-hotwordwake-word-detection-can-be-done-in-the-background-by-josh-hernandez-exe
+ git switch merge-Uberi-pr288-0cf525f-Feature-Add-hotwordwake-word-detection-can-be-done-in-the-background-by-josh-hernandez-exe
Switched to branch 'merge-Uberi-pr288-0cf525f-Feature-Add-hotwordwake-word-detection-can-be-done-in-the-background-by-josh-hernandez-exe'
+ git merge josh-hernandez-exe/listen-background-with-hotword-detection -m 'merge branch josh-hernandez-exe/listen-background-with-hotword-detection'
Auto-merging speech_recognition/__init__.py
CONFLICT (content): Merge conflict in speech_recognition/__init__.py
Recorded preimage for 'speech_recognition/__init__.py'
Automatic merge failed; fix conflicts and then commit the result.
+ git merge --abort
failed to auto-merge PR 288 -> skip



pull index 25 of 27
original PR: https://github.com/Uberi/speech_recognition/pull/203
title: Added timestamps parameter to recognize_ibm()
author: michellemorales
head_repo_name: speech_recognition
head_repo_owner: michellemorales
head_ref: master
head_sha: e10a6a863573bab6d432c7d65a31816b7ad08667
base_sha: ed1a67bbdaf1dbdccdf16630fe7127212a2e0c53
error: no such commit e10a6a863573bab6d432c7d65a31816b7ad08667
+ git fetch Uberi master
From https://github.com/Uberi/speech_recognition
 * branch            master     -> FETCH_HEAD
+ git remote add michellemorales https://github.com/michellemorales/speech_recognition
+ git fetch michellemorales master
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (3/3), done.
remote: Total 4 (delta 3), reused 3 (delta 3), pack-reused 1
Unpacking objects: 100% (4/4), 9.06 KiB | 1.13 MiB/s, done.
From https://github.com/michellemorales/speech_recognition
 * branch            master     -> FETCH_HEAD
 * [new branch]      master     -> michellemorales/master
+ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
+ git branch merge-Uberi-pr203-e10a6a8-Added-timestamps-parameter-to-recognize_ibm-by-michellemorales
+ git switch merge-Uberi-pr203-e10a6a8-Added-timestamps-parameter-to-recognize_ibm-by-michellemorales
Switched to branch 'merge-Uberi-pr203-e10a6a8-Added-timestamps-parameter-to-recognize_ibm-by-michellemorales'
+ git merge michellemorales/master -m 'merge branch michellemorales/master'
Performing inexact rename detection: 100% (310/310), done.
Auto-merging speech_recognition/__init__.py
CONFLICT (content): Merge conflict in speech_recognition/__init__.py
Recorded preimage for 'speech_recognition/__init__.py'
Automatic merge failed; fix conflicts and then commit the result.
+ git merge --abort
failed to auto-merge PR 203 -> skip



pull index 27 of 27
original PR: https://github.com/Uberi/speech_recognition/pull/122
title: Added basic kaldi-gstreamer-server support
author: astropika
head_repo_name: speech_recognition
head_repo_owner: astropika
head_ref: kaldi
head_sha: 71a57167fc9da66387859793d1300148e8e5cc0b
base_sha: ed1a67bbdaf1dbdccdf16630fe7127212a2e0c53
error: no such commit 71a57167fc9da66387859793d1300148e8e5cc0b
+ git fetch Uberi master
From https://github.com/Uberi/speech_recognition
 * branch            master     -> FETCH_HEAD
+ git remote add astropika https://github.com/astropika/speech_recognition
+ git fetch astropika kaldi
remote: Enumerating objects: 7, done.
remote: Counting objects: 100% (6/6), done.
remote: Total 7 (delta 6), reused 6 (delta 6), pack-reused 1
Unpacking objects: 100% (7/7), 4.28 KiB | 313.00 KiB/s, done.
From https://github.com/astropika/speech_recognition
 * branch            kaldi      -> FETCH_HEAD
 * [new branch]      kaldi      -> astropika/kaldi
+ git checkout master
Already on 'master'
Your branch is up to date with 'origin/master'.
+ git branch merge-Uberi-pr122-71a5716-Added-basic-kaldi-gstreamer-server-support-by-astropika
+ git switch merge-Uberi-pr122-71a5716-Added-basic-kaldi-gstreamer-server-support-by-astropika
Switched to branch 'merge-Uberi-pr122-71a5716-Added-basic-kaldi-gstreamer-server-support-by-astropika'
+ git merge astropika/kaldi -m 'merge branch astropika/kaldi'
Performing inexact rename detection: 100% (480/480), done.
Auto-merging speech_recognition/__init__.py
CONFLICT (content): Merge conflict in speech_recognition/__init__.py
Auto-merging examples/extended_results.py
Auto-merging examples/audio_transcribe.py
Recorded preimage for 'speech_recognition/__init__.py'
Automatic merge failed; fix conflicts and then commit the result.
+ git merge --abort
failed to auto-merge PR 122 -> skip