this post was submitted on 15 Apr 2024
34 points (94.7% liked)

Git

2918 readers
1 users here now

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Resources

Rules

  1. Follow programming.dev rules
  2. Be excellent to each other, no hostility towards users for any reason
  3. No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.

Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.

founded 2 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
[–] abbadon420@lemm.ee 10 points 8 months ago (1 children)

Definitely something about merge and rebase.

@abbadon420 @testeronious Yes! There has to be something better than >>>> here and there and over there for merge conflicts.