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?

Unknown parent

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
@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.

⇧