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
-
Conflicts only occur on merges / rebases. That's why you work on your own feature branch and never on the same branch at the same time.
-
hjk10157315yDon't forget the git add --all though. Else it might be a rather disappointing commit.
-
@RTRMS
I assume the person who originally created the image was used to trunk-based development.
Wow there are conflicts, please git merge first
joke/meme