From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD hint: You have divergent branches and need to specify how to reconcile them. hint: You can do so by running one of the following commands sometime before hint: your next pull: hint: hint: git config pull.rebase false # merge hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. fatal: Need to specify how to reconcile divergent branches. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 71c3cfbdb24e13e4cb0224e99894aafd3134e466. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 71c3cfbdb24e13e4cb0224e99894aafd3134e466 output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit e8f122fa30108e645b76289239bcbb7f1a6c9500. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff e8f122fa30108e645b76289239bcbb7f1a6c9500 output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 152e548f4240031a5b909e993bdc22c15fbec9cb. Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit be8af47f24474dc8c86e496c431f1bb92f34c8ed. Auto-merging .claude/HEALTH.md CONFLICT (content): Merge conflict in .claude/HEALTH.md Automatic merge failed; fix conflicts and then commit the result. error: Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 30ca242e2dae106f8e8f4acc9f5d4d6599240caf. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 30ca242e2dae106f8e8f4acc9f5d4d6599240caf output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit fc79bbd5a499289f730887875f28b9388cc2fb9e. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff fc79bbd5a499289f730887875f28b9388cc2fb9e output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit d9a29869a1a564d1e067927f147e887983e8915f. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff d9a29869a1a564d1e067927f147e887983e8915f output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 5a391894928977aae2bd55dda1b6ff9b43ca1286. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 5a391894928977aae2bd55dda1b6ff9b43ca1286 output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit f3e9ce3595d12aa18de78396d45ff553d058b9ef. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff f3e9ce3595d12aa18de78396d45ff553d058b9ef output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit e797725fc4a91a1ae617c2590bb038809978e4e2. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff e797725fc4a91a1ae617c2590bb038809978e4e2 output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 3057041a4db90cb157ca1b45f266636f120f99c7. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 3057041a4db90cb157ca1b45f266636f120f99c7 output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 4156a527f44787d99e6e4bd704e2a785bcdba0fe. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 4156a527f44787d99e6e4bd704e2a785bcdba0fe output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit a55b8f44035b73cd9ea662c0dd6153e1e52641d3. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff a55b8f44035b73cd9ea662c0dd6153e1e52641d3 output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD + 22d7763...12b209a main -> origin/main (forced update) Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 12b209ad1c7d65ee7da3633c56cca49d15295279. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 12b209ad1c7d65ee7da3633c56cca49d15295279 output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD + 34359a2...226f96b main -> origin/main (forced update) Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 226f96b04f6bcf2c49092376de82b7fa35b2284f. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 226f96b04f6bcf2c49092376de82b7fa35b2284f output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 173f32a16116416abbc7cdb8fe5abb0472af6669. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 173f32a16116416abbc7cdb8fe5abb0472af6669 output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 23a99f4e288b72579286ea2283edc2aecbcd8e94. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 23a99f4e288b72579286ea2283edc2aecbcd8e94 output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 456a4a63e5eaf497868b8f60796e0cc8d5535deb. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 456a4a63e5eaf497868b8f60796e0cc8d5535deb output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit f66ae9d65b6b06c109bf2ebf136ae86acac1fe6a. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff f66ae9d65b6b06c109bf2ebf136ae86acac1fe6a output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 6614e8b1e3cc1946a56af5d9ea3f039751667d0f. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 6614e8b1e3cc1946a56af5d9ea3f039751667d0f output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 5bf643cd144ec7e96cbaf02737697f92d95cb4e5. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 5bf643cd144ec7e96cbaf02737697f92d95cb4e5 output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit c1aa6c9abeb6fcc4a5e6ac1ef94a7f58b2e16b8f. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff c1aa6c9abeb6fcc4a5e6ac1ef94a7f58b2e16b8f output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit ada38e8c1be6897d6112a64df919ae5495c2b328. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff ada38e8c1be6897d6112a64df919ae5495c2b328 output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 04a571b4d5c585fada3fa22e500452e7db0c8d30. Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting Updating 1cfa456..3910cac From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 1cfa4561c1c3b2ffc43b0a2127489f847e40268a. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 1cfa4561c1c3b2ffc43b0a2127489f847e40268a output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 3910cacda511426d5901987d4c8b0a6da30933c7. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 3910cacda511426d5901987d4c8b0a6da30933c7 output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting Updating bcb829f..d4fc3ab From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit bcb829f83e67025201d588e2efadf1b6ec5e0bbb. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff bcb829f83e67025201d588e2efadf1b6ec5e0bbb output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit d4fc3ab2773a75d5a5c2d745a908a6a118cc6ba7. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff d4fc3ab2773a75d5a5c2d745a908a6a118cc6ba7 output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD 7750819..03f7afd main -> origin/main warning: fetch updated the current branch head. fast-forwarding your working tree from commit 7750819de31cc80acaa020e9b6194f46300fb771. error: Your local changes to the following files would be overwritten by merge: .claude/HEALTH.md Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 7750819de31cc80acaa020e9b6194f46300fb771 output, run $ git reset --hard to recover. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date. From https://github.com/mcloughlinmichaelr-debug/rateright-growth * branch main -> FETCH_HEAD Already up to date.