busy-vase-39202
01/09/2023, 1:57 PMhappy-kitchen-89482
01/09/2023, 2:07 PMtj-actions/changed-files@v32
action I guessbusy-vase-39202
01/09/2023, 2:13 PM❯ git pull pantsbuild main
remote: Enumerating objects: 159, done.
remote: Counting objects: 100% (145/145), done.
remote: Compressing objects: 100% (87/87), done.
remote: Total 159 (delta 61), reused 108 (delta 48), pack-reused 14
Receiving objects: 100% (159/159), 148.98 KiB | 2.10 MiB/s, done.
Resolving deltas: 100% (61/61), completed with 21 local objects.
From github.com:pantsbuild/pants
* branch main -> FETCH_HEAD
d098b5843..c676ef922 main -> pantsbuild/main
Successfully rebased and updated refs/heads/team.
❯ git push cczona team
To github.com:cczona/pants.git
! [rejected] team -> team (non-fast-forward)
error: failed to push some refs to 'github.com:cczona/pants.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.git pull cczona team
. I think it must have gotten ahead of local when I used github's "sync branch" button last week. Lesson learned. Stick to the cli.happy-kitchen-89482
01/09/2023, 2:25 PMbusy-vase-39202
01/09/2023, 2:25 PMgit pull
main into my branch. Do you mean literally do git merge
?