4 ms·
In my proposition, the flow: 1. commit 2. squash commits to a meaningful commit 3. merge would become: 1. code 2. merge with a meaningful commit
by z0mbie42 8y ago
In my proposition, the flow:
1. commit
2. squash commits to a meaningful commit
3. merge
would become:
1. code
2. merge with a meaningful commit
- brucedawson 8y agoThat is basically how Chromium's development workflow goes. Instead of 'merge' we have 'git cl upload' (and subsequent code review and eventual committing/merging). All of your local commits and revisions are landed as a single squished commit in the main repo.
- towaway1138 8y agoInteresting. In general this seems good, but sometimes I really do want my final submission not to be squished, e.g., because it consists of several distinct stages and is easier to understand that way.
- z0mbie42 8y agoVery interesting, I'll explore this workflow