@ -1738,7 +1738,8 @@ If not, you'll need to resolve the conflicts as you go.
The other way to do this would be to checkout `wilma` and then create the branch `fred` to point to the same point in the tree.
You can then `git rebase -i` both these branches, selecting the changes you want in `fred` or `wilma` by retaining the pick likes, and deleting the rest from the editor.
Some people would create a tag/branch called `pre-split` before starting in case something goes wrong in the split, you can undo it with the following sequence:
Some people would create a tag/branch called `pre-split` before starting in case something goes wrong in the split.
You can undo it with the following sequence:
[source,shell]
....
@ -1781,10 +1782,10 @@ Here we see the changes I've made.
You can use it to figure out where things went wrong.
I'll just point out a few things here.
The first one is that HEAD@{X} is a 'commitish' thing, so you can use that as an argument to a command.
Though if that command commits anything to the repository, the X numbers change.
You can also use the hash (first column) as well.
Although if that command commits anything to the repository, the X numbers change.
You can also use the hash (first column).
Next 'Encourage contributions' was the last commit I did to `wilma` before I decided to split things up.
Next, 'Encourage contributions' was the last commit I made to `wilma` before I decided to split things up.
You can also see the same hash is there when I created the `fred` branch to do that.
I started by rebasing `fred` and you see the 'start', each step, and the 'finish' for that process.
While we don't need it here, you can figure out exactly what happened.
@ -1981,7 +1982,7 @@ There's a number of ways around this with 'git worktree':
Warner Losh
3 years ago