Todd Wolfson

Software Engineer

October 16, 2013

Introducing git-sqwish, a git squash without repetitive merge conflicts.

It is intended to alter your workflow; shifting from git rebase and git rebase -i to git merge and git sqwish.

The result is a single merge conflict set to deal with each time you sync rather than 1 set per commit.

Screenshot of git-sqwish workflow

More information can be found in the GitHub repository.

Related articles

Develop faster

Removing the tedium from creating, developing, and publishing repos.

Top articles

Lessons of a startup engineer

Lessons from being a 3x first engineer, former Uber engineer, and working at even more startups

Sexy bash prompt

A bash prompt with colors, git statuses, and git branches.