Ranter
Join devRant
Do all the things like
++ or -- rants, post your own rants, comment on others' rants and build your customized dev avatar
Sign Up
Pipeless API
From the creators of devRant, Pipeless lets you power real-time personalized recommendations and activity feeds using a simple API
Learn More
Comments
-
usr--2ndry743225d@c3r38r170 shouldn't pull imply fetch?
unless it stops at its obscure message and doesn't update anything? -
usr--2ndry743223da 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)
Related Rants
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.
rant
developerexperience
conflict
git
merge
dx
uxfail