You received this message because you are subscribed to a topic in the Google Groups "Standard Ebooks" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/standardebooks/Q96zngDIwds/unsubscribe.
To unsubscribe from this group and all its topics, send an email to standardebook...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/standardebooks/268fca1f-f16d-42f3-9db4-0f269c856a7an%40googlegroups.com.
To unsubscribe from this group and stop receiving emails from it, send an email to standardebook...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/standardebooks/530ef573-0731-5d25-1a80-e2027896bb09%40standardebooks.org.
To unsubscribe from this group and stop receiving emails from it, send an email to standardebook...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/standardebooks/ff9d8905-1b74-0391-af72-3d8f8945315f%40standardebooks.org.
PDFs
To unsubscribe from this group and stop receiving emails from it, send an email to standardebook...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/standardebooks/12fcff47-1ab6-418f-4cc0-88bcdabea9e5%40standardebooks.org.
To view this discussion on the web visit https://groups.google.com/d/msgid/standardebooks/97673C71-1554-4A24-BA08-B6152EDB4AE1%40reala.net.
To view this discussion on the web visit https://groups.google.com/d/msgid/standardebooks/B97058F9-AA78-48E3-BCF2-9B5AF240D256%40reala.net.
To unsubscribe from this group and stop receiving emails from it, send an email to standardebook...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/standardebooks/fdf3276f-66bc-1cd2-4425-dd57a4834038%40standardebooks.org.
git rebase -i 415f7a0
On Dec 17, 2021, at 2:03 PM, John Rambow <ram...@gmail.com> wrote:
Hi Alex,Thanks for checking in. I've been working on a duped repository to try to bend rebasing and git to my will, but it hasn't worked so far. I've been reading up, but I'm in over my head.I can try to lay out what I need to do in an email later this week, because I'll need some advice on how to get it done. Basically there are two editorial commits in which I changed italics to <em>. I presume I need to create new noneditorial commits to include those changes, and then rebase.
--
You received this message because you are subscribed to a topic in the Google Groups "Standard Ebooks" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/standardebooks/Q96zngDIwds/unsubscribe.
To unsubscribe from this group and all its topics, send an email to standardebook...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/standardebooks/605EDC63-A4EC-43A3-BC61-445898CC25CC%40letterboxes.org.
It is a little daunting at first, but it’s not too difficult once you’ve done it a time or two.You’re already working on a copy of the repository, so that’s good. Always do that. :)An interactive rebase allows you to essentially rewind git to the point immediately after a commit, make any changes you want to that commit and amend it, then play forward the remaining commits. (It lets you do other things as well, but all we need to worry about right now is editing a commit.)So, e.g., if you want to split your 3beef22 commit into two commits, you would use the following command (you specify the commit before the one you want to change):git rebase -i 415f7a0That will bring up your chosen editor with a list of all of the commits from the next one forward, with the oldest one (the one you want to change) at the top. There are comments at the bottom of the editor that tell you all of your choices, but in this case, you want to change the first word on that first line (3beef22) from “pick” to “edit”, because you want to edit, i.e. change, that commit. Then save the file. You’ll be back at the command line, and git will have showed instructions for what to do, i.e. make changes and amend the commit, then do a git rebase --continue to play forward the remaining commits.That particular commit contains both the <i> to <em> changes, which are not editorial, as well as the spelling/dash changes, which are. You can pick which one is the fewer changes and undo those, then do the normal git add <files>, then amend the commit with git ci --amend, which will then prompt you for a new commit message (or you can specify it on the command line as per normal).
Then, do aF to play forward everything else. Note that it’s possible that changes to the commit will cause downstream issues. If that happens, git will stop at whatever commit it happens on and tell you to resolve the merge differences before continuing. One or more files will have the “>>>>” “======“ “<<<<<“ markers that indicate before and after; these are instances where a change was made to the same paragraph (line) in a later commit that was modified in the changes above. So, if the line before said, “This is a letter.”, and you changed it above to be “This is the letter.”, but then another commit later changed it to “This is a telegram.”, that’s going to cause a merge difference, because the later change should now be “This is the telegram.” The file contains both the before and after (hence the markers); you just need to make the appropriate changes to whichever one is easier, then get rid of the other one and the markers. You’ll need to add the file(s), commit the change, then do another continue. It’s possible you might have to do that more than once, depending on how extensive the changes were in the original edit, and how often affected lines were changed by later commits.
Once the continue finishes, you’re back at the present, git-wise, and you can then make any other changes you want, including the changes you backed out from the commit above.Rinse and repeat for any other commits that need to be edited.A couple of notes:
- We don’t generally mess with dashes that modernize-spelling doesn’t correct. We also generally don’t worry too much about words that are variants in M-W, e.g. gayly. So, in this particular case, the non-italic changes in 3beef22 aren’t necessary. They aren’t bad, just not necessary. :)
- A couple of the other commits have commit messages that don’t reflect what was actually done in the commit. For example, 83e185c says “removed hyphens from adverbs ending in ly before noun, etc.”, but that’s not what is in that commit. Also, that commit includes a word change (gunstalks to gunstocks) that, if it should be made at all (are we sure that wasn’t intentional?), should be editorial. So:
- You might revisit the non-editorial commits and ensure there aren’t any editorial changes in them (you’re already looking at the opposite), and
- As you’re looking through everything, you might also make sure that each commit message reflects the content of the commit.
Good luck!On Dec 17, 2021, at 2:03 PM, John Rambow <ram...@gmail.com> wrote:Hi Alex,Thanks for checking in. I've been working on a duped repository to try to bend rebasing and git to my will, but it hasn't worked so far. I've been reading up, but I'm in over my head.I can try to lay out what I need to do in an email later this week, because I'll need some advice on how to get it done. Basically there are two editorial commits in which I changed italics to <em>. I presume I need to create new noneditorial commits to include those changes, and then rebase.On Fri, Dec 17, 2021 at 1:15 PM Alex Cabal <al...@standardebooks.org> wrote:Hi John, have you had a chance to wrap this up?
--
You received this message because you are subscribed to a topic in the Google Groups "Standard Ebooks" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/standardebooks/Q96zngDIwds/unsubscribe.
To unsubscribe from this group and all its topics, send an email to standardebook...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/standardebooks/605EDC63-A4EC-43A3-BC61-445898CC25CC%40letterboxes.org.
On Dec 31, 2021, at 9:29 AM, John Rambow <ram...@gmail.com> wrote:
I had a couple questions I was hoping for some help with.1) I've been playing through various rebases using a dupe of my repository. When I do them, i always create additional branches, which I can see in Sublime Merge. I thought avoiding creating additional branches was the whole point of rebasing, so this makes me question whether I'm doing things right.Below is an example, pasted in from Sublime Merge. The first commit in the lowest blue square was updated (its description changed) -- and it appears as the lowest blue square. But the older purple commits are all still there. (The two branches separated, of course, at the last commit before I made changes.) Is that the expected behavior?2) I'm confused about the commit add command. Should it be git add -A, to add all the files that have been updated in the text editor?This is the what the workflow seems like it should be, starting, after after I "pick" the commit to edit in the text editor:[close file in text editor]git ci --amend[back in text editor; edit the "following" commit, the first one listed and save]git add -A [which specifies you want to commit all the files that have changed, not just some]git rebase --continue[then deal with any merge conflicts -- I've been using Sublime Merge, and the correct version is always the versions on the "left," which has changes I made previously in other commits ]3) Speaking of the merge conflicts, some documentation seems to talk about seeing conflicts actually in the text editor, but I'm not sure how to pull that up -- do I just start opening files? Sublime Merge seems to show any conflicts, however, so I've been using that to choose which version of files to use, which is always the one that includes my changes, obvs.Thank you, and Happy New Year to all.
<image.png>
On Fri, Dec 17, 2021 at 4:04 PM Vince <vr_se...@letterboxes.org> wrote:
It is a little daunting at first, but it’s not too difficult once you’ve done it a time or two.You’re already working on a copy of the repository, so that’s good. Always do that. :)An interactive rebase allows you to essentially rewind git to the point immediately after a commit, make any changes you want to that commit and amend it, then play forward the remaining commits. (It lets you do other things as well, but all we need to worry about right now is editing a commit.)So, e.g., if you want to split your 3beef22 commit into two commits, you would use the following command (you specify the commit before the one you want to change):git rebase -i 415f7a0
That will bring up your chosen editor with a list of all of the commits from the next one forward, with the oldest one (the one you want to change) at the top. There are comments at the bottom of the editor that tell you all of your choices, but in this case, you want to change the first word on that first line (3beef22) from “pick” to “edit”, because you want to edit, i.e. change, that commit. Then save the file. You’ll be back at the command line, and gitwill have showed instructions for what to do, i.e. make changes and amend the commit, then do a git rebase --continue to play forward the remaining commits.
A---B---C topic* / D---E---F---G master
Here you have two branches, "master" and "topic".
Say you are on the topic branch (hence the * ), and you want to merge by the way of rebasing.
What you would probably want to do is to rebase the "topic" branch onto the "master" branch.
The "topic" branch will have a NEW base, hence "rebasing".
The command will be (again assuming you are ON the "topic" branch):
git rebase masterYou will have moved all the commits on the "topic" branch, "A", "B", and "C", on top of the master branch ("G"):
A'--B'--C' topic / D---E---F---G master
Several things: "A", "B", and "C" on the original "topic" branch is updated to A', B', and C'.
This is because it now contains all the chances from the master branch.
Discrepancies between D, E, F, G and A, B, C that cannot be resolved automatically are "merge conflicts."
You'll have to go in and tell git manually if you want to keep the change from the "master" branch or from the "topic" branch.
Hopefully this makes it clearer.
As for workflow, here's what I usually do (not prescriptive, obviously):Here is what the branch looks like before I make any changes.
D---E---F---G master
D---E---F---G---(untracked changes) master
Once I make some changes to one or more files, this is what's going to show up on git cli or sublime merge.
Git has detected some changes in the local repo, but it's not tracking it.
What this means is that if you do a "commit" now, nothing is "saved" to the branch.
In fact, if you try to commit now, git will say there is "nothing to commit."
Now, you can issue the commend:
git add -A
And git will know to start tracking all the files that have been changed (-A for all):
D---E---F---G---(tracked changes) master
Now you can issue a commit command:
git commit -m "This is a commit message."
Which will results in a NEW commit that details all the changes since commit "G":
D---E---F---G---H master
What I was saying earlier is that you might have been on the wrong branch when you issued the rebase command, or maybe you specified the wrong branch name for the branch to rebase to.
If you want, you can include more screenshots of SMerge, and I can try to help more from there.
--
You received this message because you are subscribed to the Google Groups "Standard Ebooks" group.
To unsubscribe from this group and stop receiving emails from it, send an email to standardebook...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/standardebooks/A5A8AF7E-2B4C-4B90-A6C5-9B930F28C9D6%40letterboxes.org.
To view this discussion on the web visit https://groups.google.com/d/msgid/standardebooks/CAB6ohTexdi3pMqSQQU_80hDC_%3DrKQB5NazpkKEeb%2BeO5G__xmg%40mail.gmail.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/standardebooks/CAFu_-g-mJqY-sS%2Bs6oKcczRpK3Fou6TV8h3DJ8W0bFZ2Gh%3Dnaw%40mail.gmail.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/standardebooks/CAB6ohTdbQe4A4LFMz0nxAOLe4Pag0hd7kCp3ReboXevatDy%2BYA%40mail.gmail.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/standardebooks/af3d22b4-b368-1c5e-c8ff-f3607259f8d6%40standardebooks.org.