search

turanct / mob

📡 Easily switch drivers while Remote Mob Programming without disrupting git workflow
MIT License
6 stars 1 forks source link

mob continue fails even on clean branch #6

Open mirceadamoc opened 3 years ago

mirceadamoc commented 3 years ago 
Fetching origin
From github.com:engagor/engagor
 * [new branch]            wip-mob-feature-CB-8808-instagram-publishing -> origin/wip-mob-feature-CB-8808-instagram-publishing
From github.com:engagor/engagor
 * branch                  feature-CB-8808-instagram-publishing -> FETCH_HEAD
Already up to date.
Current branch feature-CB-8808-instagram-publishing is up to date.
Switched to a new branch 'wip-mob-feature-CB-8808-instagram-publishing'
Branch 'wip-mob-feature-CB-8808-instagram-publishing' set up to track remote branch 'wip-mob-feature-CB-8808-instagram-publishing' from 'origin'.
From github.com:engagor/engagor
 * branch                  wip-mob-feature-CB-8808-instagram-publishing -> FETCH_HEAD
Already up to date.
Current branch wip-mob-feature-CB-8808-instagram-publishing is up to date.
Saved working directory and index state WIP on wip-mob-feature-CB-8808-instagram-publishing: fe183e2606 ✨ Allow publishing to Instagram via the Publisher
From github.com:engagor/engagor
 * branch                  wip-mob-feature-CB-8808-instagram-publishing -> FETCH_HEAD
Updating fe183e2606..da38c10e7d
Fast-forward
 .../ci_tests/utils/Utils_VideoInfoTest.php         | 10 +++++
 .../QueryConnectedServiceConfiguration.php         | 39 +++++++++++++++++++
 app/protected/class/Posts.php                      | 13 ++++++-
 .../class/services/facebook/Application.php        |  2 +-
 .../twitter/UsersConnectedServiceConfiguration.php |  2 +-
 app/protected/class/utils/VideoInfo.php            | 45 ++++++++++++----------
 .../controller/debug/AnthonyController.php         | 18 +++++++++
 .../services/ConnectedServicesController.php       |  3 ++
 8 files changed, 109 insertions(+), 23 deletions(-)
 create mode 100644 app/protected/ci_tests/utils/Utils_VideoInfoTest.php
Current branch wip-mob-feature-CB-8808-instagram-publishing is up to date.
Switched to branch 'feature-CB-8808-instagram-publishing'
Your branch is up to date with 'origin/feature-CB-8808-instagram-publishing'.
error: The following untracked working tree files would be overwritten by merge:
    app/protected/ci_tests/utils/Utils_VideoInfoTest.php
Please move or remove them before you merge.
Aborting
The stash entry is kept in case you need it again.
 ⚠️  An error occured. Check the logs to see what happened.
ToonGagor commented 3 years ago

it has to do with new file being checked out, and not added to the stash, then being overwritten by the stash resulting in a merge failure