Skip to content

demo: git-first e2e (schema-node-label marker) - #12

Closed
luvkapur wants to merge 5 commits into
mainfrom
demo-e2e-git-first
Closed

demo: git-first e2e (schema-node-label marker)#12
luvkapur wants to merge 5 commits into
mainfrom
demo-e2e-git-first

Conversation

@luvkapur

@luvkapur luvkapur commented Aug 7, 2026

Copy link
Copy Markdown
Member

E2E verification flow 1 (git-first). Should be adopted into a bit.cloud lane by bit-adopt-pr.yml, then synced by bit-sync.yml. Will be closed without merging.

@github-actions

github-actions Bot commented Aug 7, 2026

Copy link
Copy Markdown

bit-git-sync could not reconcile this branch automatically: branch has commits but its .bitmap records no state for this lane; cannot tell which side is newer

To resolve locally:
git fetch origin && git checkout 'demo-e2e-git-first'
bit lane import 'teambit.api-reference/demo-e2e-git-first'

resolve conflicts, commit the result, then:

git push origin 'demo-e2e-git-first'

Remove the bit-sync-conflict label to resume syncing.

luvkapur and others added 2 commits August 7, 2026 16:37
@github-actions

github-actions Bot commented Aug 7, 2026

Copy link
Copy Markdown

bit-git-sync could not reconcile this branch automatically: unexpected failure while reconciling diverged lane teambit.api-reference/demo-e2e-git-first with branch demo-e2e-git-first: To https://github.com/teambit/bit-git-sync-example
! HEAD:refs/heads/demo-e2e-git-first [rejected] (fetch first)
Done
Pushing to https://github.com/teambit/bit-git-sync-example
error: failed to push some refs to 'https://github.com/teambit/bit-git-sync-example'
hint: Updates were rejected because the remote contains work that you do not
hint: have locally. This is usually caused by another repository pushing to
hint: the same ref. If you want to integrate the remote changes, use
hint: 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

To resolve locally:
git fetch origin && git checkout 'demo-e2e-git-first'
bit lane import 'teambit.api-reference/demo-e2e-git-first'

resolve conflicts, commit the result, then:

git push origin 'demo-e2e-git-first'

Remove the bit-sync-conflict label to resume syncing.

… f8f734317

Bit-Lane-Head: f8f7343170c2fa62c8d86ba754132802c7a88fec
[bit-sync]
@luvkapur

luvkapur commented Aug 7, 2026

Copy link
Copy Markdown
Member Author

E2E verification complete (git-first, diverged-merge, converged-noop flows all proven). Closing without merging per verification policy.

@luvkapur luvkapur closed this Aug 7, 2026
@luvkapur
luvkapur deleted the demo-e2e-git-first branch August 7, 2026 20:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant