2 ms·
You can have merge conflicts, when you combine two commits (--amend in git terminology, not sure how it's called in jj)?
by 1718627440 1y ago
You can have merge conflicts, when you combine two commits (--amend in git terminology, not sure how it's called in jj)?
- steveklabnik 1y agoOh, since you said 'merge' I thought you meant like git merge. Amending a commit works the same way as git. The difference is just that the oplog will have the full history, including before you amended, so you can roll back easily.
- 1718627440 1y agoSo the history of the second commit gets discarded?
- steveklabnik 1y agoAh, I see what you're saying. I think so, the evolog ends up showing that stuff was squashed elsewhere, I believe.