Hacker News new | ask | show | jobs
by karatinversion 932 days ago
No, that’s not right. If you did that, you would need to force push to get the result pushed to the remote.
1 comments
Sharlin 932 days ago
Oh, right. So what actually happens is that the offshoot must first be rebased on top of the trunk, and then trunk can be fast-forward merged/rebased (same thing, really) to the offshoot's head.
link