Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run Sync Script (error) #958

Open
BaseMax opened this issue Jan 13, 2025 · 2 comments
Open

Run Sync Script (error) #958

BaseMax opened this issue Jan 13, 2025 · 2 comments
Labels
bug Something isn't working github testing yaml
Milestone

Comments

@BaseMax
Copy link
Member

BaseMax commented Jan 13, 2025

https://github.com/SalamLang/Salam/actions/runs/12753535930/job/35545411324

Run FIRST_NAME="Max"
[main 00a8669] Auto-sync: Update after running sync.py script
 1 file changed, 1 insertion(+), 2 deletions(-)
remote: error: GH006: Protected branch update failed for refs/heads/main.        
remote: 
remote: - Changes must be made through a pull request.        
To https://github.com/SalamLang/Salam.git
 ! [remote rejected] main -> main (protected branch hook declined)
error: failed to push some refs to 'https://github.com/SalamLang/Salam.git'
Error: Process completed with exit code 1.
BaseMax added a commit that referenced this issue Jan 13, 2025
@BaseMax
Copy link
Member Author

BaseMax commented Jan 13, 2025

gh pr added to the github actions.

@BaseMax
Copy link
Member Author

BaseMax commented Jan 13, 2025

Switched to a new branch 'auto-sync-update'
[auto-sync-update e117d20] Auto-sync: Update after running sync.py script
 1 file changed, 1 insertion(+), 2 deletions(-)
To https://github.com/SalamLang/Salam.git
 ! [rejected]        auto-sync-update -> auto-sync-update (fetch first)
error: failed to push some refs to 'https://github.com/SalamLang/Salam.git'
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.
Error: Process completed with exit code 1.

updated. https://github.com/SalamLang/Salam/blob/main/.github/workflows/run-sync-script.yaml

and:
https://github.com/SalamLang/Salam/actions/runs/12754050553/job/35547008781

Run FIRST_NAME="Max"
Switched to a new branch 'auto-sync-update'
From https://github.com/SalamLang/Salam
 * branch            auto-sync-update -> FETCH_HEAD
 * [new branch]      auto-sync-update -> origin/auto-sync-update
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.
Branch does not exist on remote, skipping pull.
[auto-sync-update c7dfbf6] Auto-sync: Update after running sync.py script
 1 file changed, 1 insertion(+), 2 deletions(-)
To https://github.com/SalamLang/Salam.git
 ! [rejected]        auto-sync-update -> auto-sync-update (non-fast-forward)
error: failed to push some refs to 'https://github.com/SalamLang/Salam.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. If you want to integrate the remote changes,
hint: use 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@jbampton jbampton added the bug Something isn't working label Jan 25, 2025
@jbampton jbampton added this to the January milestone Jan 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working github testing yaml
Projects
None yet
Development

No branches or pull requests

2 participants