Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

You can have merge conflicts, when you combine two commits (--amend in git terminology, not sure how it's called in jj)?


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.


So the history of the second commit gets discarded?


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: