Go to file
jlamothe f17b50331a typo in file.txt 2023-11-17 18:31:23 +00:00
README.md added README.md 2023-11-17 18:28:12 +00:00
file.txt typo in file.txt 2023-11-17 18:31:23 +00:00

README.md

I made this repository to illustrate some issues I've been having with Plan9's git implementation.

Rebase Problem

Switch to branch b with:

git/branch b

Try to rebase it on top of branch a with:

git/rebase a

Notice that branch now points to the same commit as branch a. The last commit from branch b seems to have ceased to exist.

Merge Problem

Switch to branch c with:

git/branch c

Try to merge in branch a with:

git/merge a

Notice that this should have resulted in a merge conflict, but didn't.