---
title: "Some Git poll results"
description: "!https://jvns.ca/blog/2024/03/28/git-poll-results/"
date: 2024-03-29
published: true
tags:
  - git
  - thought
template: link
---


<div class="embed-card embed-card-external">
  <a href="https://jvns.ca/blog/2024/03/28/git-poll-results/" class="embed-card-link" target="_blank" rel="noopener noreferrer">
    <div class="embed-card-content">
      <div class="embed-card-title">Some Git poll results</div>
      <div class="embed-card-description">Some Git poll results</div>
      <div class="embed-card-meta">Julia Evans &middot; jvns.ca</div>
    </div>
  </a>
</div>


great poll of git questions

> poll: did you know that in a git merge conflict, the order of the code is different when you do a merge/rebase?
> 
> merge:
> 
> \<\<\<\<\<\<\< HEAD
> YOUR CODE
> =======
> OTHER BRANCH'S CODE
> >>>>>>> c694cf8aabe
> 
> rebase:
> 
> <<<<<<< HEAD
> OTHER BRANCH'S CODE
> =======
> YOUR CODE
> >>>>>>> d945752 (your commit message)


This one explains a lot.  I _think_ I knew this, I might have seen it somewhere, but I have definitely noticed it go both ways and confuse the crap out of me.  Feels very similar to how `--ours` and `--theirs` flip flops.