uuid:
  - value: 2f576a37-bd5a-4894-9340-1e69775c8b68
langcode:
  - value: en
type:
  - target_id: daily_email
    target_type: node_type
    target_uuid: 8bde1f2f-eef9-4f2d-ae9c-96921f8193d7
revision_timestamp:
  - value: '2025-05-11T09:00:16+00:00'
revision_uid:
  - target_type: user
    target_uuid: b8966985-d4b2-42a7-a319-2e94ccfbb849
revision_log: {  }
status:
  - value: true
uid:
  - target_type: user
    target_uuid: b8966985-d4b2-42a7-a319-2e94ccfbb849
title:
  - value: 'Making Git work the way you want'
created:
  - value: '2024-03-31T00:00:00+00:00'
changed:
  - value: '2025-05-11T09:00:16+00:00'
promote:
  - value: false
sticky:
  - value: false
default_langcode:
  - value: true
revision_translation_affected:
  - value: true
path:
  - alias: /daily/2024/03/31/making-git-work-the-way-you-want
    langcode: en
body:
  - value: |
      <p>Another question that followed my recent Git emails was, " I assume you use rebase over merge?"</p>

      <p>The short answer is "yes". I like to keep the history of my repositories clean and simple to read by keeping the logs linear and not full of merge commits.</p>

      <p>The longer answer is that I do merges, but only fast-forward merges, at least by default.</p>

      <p>If, when merging, Git can fast-forward my branch to the latest commit without creating a merge commit, it will do so.</p>

      <p>If not, I can then rebase my changes to make them linear and fast-forwardable. Alternatively, if the commits have already been pushed and cannot be overwritten, I can explicitly allow a non-fast-forward merge in that situation.</p>

      <p>I have Git configured to work this way as that's how I want it to work, and that configurability is something I like about Git.</p>

      <p>If you want to see how I have Git configured, my settings are in <a href="https://github.com/opdavies/dotfiles.nix/blob/462eff64f227332d58c7c3652eeaa88b692c064d/lib/shared/modules/git.nix#L95-L135">my dotfiles repository</a> (note this file is written in the Nix language as I use Nix to manage my configuration).</p>

      <p>If you're working in a team, I'd suggest having a common configuration for everyone and defined rules for how you're going to use Git (branch names, merge or rebase, etc) to avoid inconsistencies.</p>

              
    format: full_html
    processed: |
      <p>Another question that followed my recent Git emails was, " I assume you use rebase over merge?"</p>

      <p>The short answer is "yes". I like to keep the history of my repositories clean and simple to read by keeping the logs linear and not full of merge commits.</p>

      <p>The longer answer is that I do merges, but only fast-forward merges, at least by default.</p>

      <p>If, when merging, Git can fast-forward my branch to the latest commit without creating a merge commit, it will do so.</p>

      <p>If not, I can then rebase my changes to make them linear and fast-forwardable. Alternatively, if the commits have already been pushed and cannot be overwritten, I can explicitly allow a non-fast-forward merge in that situation.</p>

      <p>I have Git configured to work this way as that's how I want it to work, and that configurability is something I like about Git.</p>

      <p>If you want to see how I have Git configured, my settings are in <a href="https://github.com/opdavies/dotfiles.nix/blob/462eff64f227332d58c7c3652eeaa88b692c064d/lib/shared/modules/git.nix#L95-L135">my dotfiles repository</a> (note this file is written in the Nix language as I use Nix to manage my configuration).</p>

      <p>If you're working in a team, I'd suggest having a common configuration for everyone and defined rules for how you're going to use Git (branch names, merge or rebase, etc) to avoid inconsistencies.</p>

              
    summary: null
field_daily_email_cta: {  }