Skip to content

Aborting completing a feature with uncommitted changes. #1

@peakpg

Description

@peakpg
  1. While working in a feature branch, assume there are uncommitted changes along with several commits that would need to be squashed.
  2. Run gd done
  3. Don't save the commit (ie in Textmate, cancel the save)

Expected: An interactive rebase so I can squash the commit.
Actual: The rebase is aborted since there are uncommited changes. The commits are then merged into master.

Solution:
Abort the process if there are uncommitted changes. Remove the automatic commit in favor of just a check and then warning. (This might be preferable since the 'commit all' is probably overly greedy anyway.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions