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
-
kamen69955yConflicts shouldn't matter - if you're so far behind the tip of the branch, then your uncommitted local work is probably so old that you might throw it away. If it was important, you should've committed it or at least stashed it.
-
slashasdf445yDo you have multiple developers on local branches all pushing directly to origin/master?
You might want to rethink that for your own sanity. -
@slashasdf
senior : “oh, I’ve been merge to master branch for weeks now, you guys should update it.“
Related Rants
```
Your branch is behind 'origin/master' by 562 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
```
`$ git pull`
```
251 files changed, 103274 insertions(+), 1361 deletions(-)
```
okay fuck.
rant
pull
master
merge
origin
git