Skip to main content

#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?

#git #plan9
in reply to Jonathan Lamothe

seeh
seeh
• •
i older days i have used a jetbrains IDE for merge, and was sometimes really cool that its has overed me a special merge that has solved conflicts automatically. funny point: it worked pretty good for me.
Unknown parent

Jonathan Lamothe
Jonathan Lamothe
•

@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 https://git.fingerprintsoftware.ca/9p/example.git and consult the README.md file for details.

@pixx
Unknown parent

Jonathan Lamothe
Jonathan Lamothe
•

@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
Unknown parent

Jonathan Lamothe
Jonathan Lamothe
•
@pixx I don't recognize the @{...} syntax. What's happening there?
@pixx

This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.

⇧