Graydon on Nostr: npub1upkp7…4tcwy npub1uzgxh…cychd `git rebase branch` on main does result in a ...
npub1upkp7fd7rc3lrjg23r8gy0wc723vze7mxlx5984ut6zurjzpf5xss4tcwy (npub1upk…tcwy) npub1uzgxh53ntnrjf3q4w3zjq7xgx50h64m5p85pvz9gqj928k0quluqxcychd (npub1uzg…ychd) `git rebase branch` on main does result in a weird state. Would not recommend.
`git rebase main` **on branch** updates your branch commits to be as they would have been had you started from where main is now, and that will let you find the places where your work is in conflict with the rest of the team's work.
It's also stuff that has to be dealt with eventually so might as well do it locally.
`git rebase main` **on branch** updates your branch commits to be as they would have been had you started from where main is now, and that will let you find the places where your work is in conflict with the rest of the team's work.
It's also stuff that has to be dealt with eventually so might as well do it locally.