2

Your branch and 'origin/foo/bar' have diverged,
and have 2 and 1 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)

git pull
hint: You have divergent branches and need to specify how to reconcile them.

git merge origin foo/bar
Already up to date.

Comments
  • 3
    git fetch?
  • 1
    Time for a rebase
  • 1
    @c3r38r170 shouldn't pull imply fetch?

    unless it stops at its obscure message and doesn't update anything?
  • 0
    @usr--2ndry Not really... or maybe... Idk. Maybe it can break something.
  • 0
    a bit like those apparent conflicts

    <<< main

    ++ "foo": "^1.2.3",

    ===

    ++ "bar": "^2.3.3",

    <<< head

    "baz": "~0.1.2",

    <<<<<<< main

    -- "version": "2.0.1",

    ++ "version": "2.0.2",

    ===

    -- "version": "2.0.1",

    ++ "version": "2.0.3",

    <<< head

    (not the exact syntax, retyped from my biological memory, plus additional blank lines added by devrant on save)
Add Comment