Conversation
|
It looks like these changes are correct, but this branch contains the commits from #50 as well as the renaming changes, which makes the diffs really difficult to read. Once this is fixed, I'll be able to see exactly what this PR is doing and then review it. The way to fix this is to 'rebase' this branch onto the new Rebasing is done differently depending on how you're using Git. I use the command line, and these commands would perform the rebase (without combining any commits): # Make sure that your master branch is up to date with my master branch
git checkout master
git fetch upstream
git pull upstream master
# Rebase this branch onto master
# (this will essentially 'play back' your changes but on top of the new master branch)
git checkout rename_cursor_path
git rebase masterWhat should happen is that the first 4 commits (which are from #50) should disappear and you'll be left with just the last 2. You'll then have to force-update your public branch on GitHub with git push origin --force-with-lease(supplying your username and password). I can do the rebase if necessary, but it's a useful thing to learn. |
|
I will fix this. |
8efc0ea to
d378069
Compare
|
Ayy this is much better! Do you want to do an 'interactive' rebase to combine the commits? It would make a lot more sense in the commit history if the refactoring was done in one step. I can provide CLI instructions if you want them, but it involves quite a lot of steps so if you're using git a different way then there are probably instructions for that. |
|
I'd like to try it. I personally don't use git very often. |
|
Cool - it's very satisfying to be able to rewrite history and make mistakes disappear 😁. Also, I'm heading off to bed now - I'll respond to this in the morning. |
|
Oh yeah also, GitHub needs the word So |
Changed
cursor_path::CursorPathtocursor::Path.Closes #45