Programming

13383 readers

1 users here now

All things programming and coding related. Subcommunity of Technology.

This community's icon was made by Aaron Schneider, under the CC-BY-NC-SA 4.0 license.

founded 2 years ago

MODERATORS

remington

alyaza

Hexorg

How often do you have to resolve merge conflicts? (feddit.de)

submitted 1 year ago* (last edited 1 year ago) by TiphaineRupa@feddit.de to c/programming

29 comments fedilink hide all child comments

Recently I've experienced a significant increase in merge conflicts at the company I'm currently working at (we hired a couple of junior data scientists and some are not that familiar with git)

Even though those merge conflicts can be a little tedious to resolve, I realized that I personally started to enjoy it - especially using fugitive. Haven't had many conflicts in a while, so almost forgot about Gdiffsplit and how awesome that plugin is...

Now I'm wondering, how often do you have to resolve (more or less complex) merge conflicts?

you are viewing a single comment's thread
view the rest of the comments

[–] jmsw22@lemmy.ml 2 points 1 year ago (1 children)

We’re a small team, so generally are able to divide up work so that we’re not treading on each others toes. If it does happen it’s usually because we’ve made some project wide change like retrofitting auditing or something.

I’ve not heard of fugitive, I’ll have to check it out!

[–] neotecha 2 points 1 year ago

Fugitive is a common git plugin for Vim. If you're not using vim, not much to check out. If you are, highly recommend it!