Home/ Questions/Q 1030497
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-16T12:42:34+00:00

My usual workflow with git is to create a new feature branch, do some

  • 0

My usual workflow with git is to create a new feature branch, do some work with frequent commits, and then merge back into the development branch when the feature is working and/or stable.

Usually, when I do git merge --squash feature-branch, I get a nice “squashed commit of the following” message that auto-populates with all of the commit messages from the feature branch.

However, if there are any merge conflicts (say I finished and merged another feature while working on this one), I seem to lose all of my commit messages from the branch. The auto-populated commit message fills in the conflicts, but not the commit messages. Where did my commit messages go? Can I get them back?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    This doesn’t answer your question directly, but you should be able to avoid the conflict in the first place.

    Consider doing a 

    git rebase master topic

    before performing the merge. The DESCTIPTION section of this page http://git-scm.com/docs/git-rebase should be helpful.This may also obviate the need for the squash as an interactive rebase would allow you to to squash commits of your choosing.

    EDIT:
    See also: In git, what is the difference between merge –squash and rebase?

    • 0