57 ms·
For visual history this seems like a nice approach. In a large organization, can it be done atomically or is there a risk someone else merges before you during
by Too 5y ago
For visual history this seems like a nice approach. In a large organization, can it be done atomically or is there a risk someone else merges before you during the rebase?
But I believe this also suffers from the problem described in OP where you can't tell if HEAD^ (or any parent) is from master or from feature branch.
- masklinn 5y ago> In a large organization, can it be done atomically or is there a risk someone else merges before you during the rebase? It can be done atomically by having a tool perform the rebase and merge, and never merging anything by hand. That’s necessary to implement the “not rocket science” rule anyway.