Hacker News
new
|
past
|
comments
|
ask
|
show
|
jobs
|
submit
login
1718627440
on July 22, 2025
|
parent
|
context
|
favorite
| on:
Jujutsu for busy devs
You can have merge conflicts, when you combine two commits (--amend in git terminology, not sure how it's called in jj)?
steveklabnik
on July 22, 2025
[–]
Oh, 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
on July 23, 2025
|
parent
[–]
So the history of the second commit gets discarded?
steveklabnik
on July 23, 2025
|
root
|
parent
[–]
Ah, I see what you're saying. I think so, the evolog ends up showing that stuff was squashed elsewhere, I believe.
Guidelines
|
FAQ
|
Lists
|
API
|
Security
|
Legal
|
Apply to YC
|
Contact
Search: