#Git on #Plan9 is borken in weird ways.
Want to rebase branch A on top of branch B? No you don't. You want to change A to match B and drop all other commits.
Want to merge A into B but there's a conflict? Let's just arbitrarily take the line from A and ignore the one from B. That's what you wanted, right?
like this
seeh
in reply to Jonathan Lamothe • • •Jonathan Lamothe
Unknown parent • •@pixx I don't know if it's something weird about the version of git that's on SDF's Plan9 server. Perhaps it's out of date, but I've created an example repository that illustrates what I'm talking about.
You can clone from git.fingerprintsoftware.ca/9p/… and consult the README.md file for details.
pixx likes this.
Jonathan Lamothe
Unknown parent • •@pixx There's also the rebase issue where it seems to just drop the commits in the branch being merged and moves the head to the base branch.
Again, I don't know if this is just a problem on whaever version of the software SDF is using.
pixx likes this.
Jonathan Lamothe
Unknown parent • •@{...}syntax. What's happening there?