1222
A classic (sopuli.xyz)
submitted 2 years ago by to c/programmerhumor@lemmy.ml
37 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] 109 points 2 years ago (5 children)

I feel like I often would prefer to get the merge conflict. So many times my coworkers will somehow mess up the code I committed when resolving the conflict.

  • permalink
  • fedilink
  • source
  • hideshow 10 child comments
    •
  • [–] 33 points 2 years ago (1 child)

    Rebase all of your work branches onto HEAD so that conflicts require refactoring the first commit where things don't match up. This can make conflicts easier to deal with (in my humble opinion) since you deal with conflicts earlier in your commit history as opposed to at the end after ALL of your changes are made.

    Plus a linear history is super nice to work with later on.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 2 child comments
    •