![]() ![]() I decided that I really didn't need to do a rebase and that this was going to be more of a pain than it was worth. Right after that another conflict popped up. Instead of resolving the conflict I decided to just to git-rebase -skip for that commit. I don't know exactly what the problem was but it caused an issue with the rebase. ![]() But for some reason git had been acting funny because I had replaced a file titled "Movie.png" with a different image file called "Movie.png". Oftentimes when doing a rebase you will run into conflicts that you have to resolve before the rebase will complete. Branches are put together by stringing together a line of parent ids. It also doesn't know anything about its children. The parent is the sha1 hash of the direct ancestor of the selected commit.Ī git branch really doesn't know anything more about its lineage than its direct parent. The commit is assigned a sha1 hash (basically, a unique id), a message and a parent. Whenever you make a commit with Git you are taking a snapshot of how your repository looks at that moment. To understand the problem you need to understand how Git works internally. So I began to look for different options. There is nothing worse than having to finish something twice. That was much better than losing an entire day's work, but I had still done a lot of work in that last hour. Checking the backup I could see that I had a backup from about an hour ago. Time Machine has saved me from myself more than once in my life so that was the first place I went to. I looked frantically for a way to recover from my disaster. I had lost my css, my copy, my design, everything. Basically all of my changes were gone.Įxtreme panic set in. I had done a LOT of work in that 24 hour period. After aborting the rebase my marketing branch was at the same state it had been the day before. At least it didn't work the way I expected it to. I ran into a few problems with the rebase and decided to abort, which has always worked before, but not this time. I'll go into the details of how rebase works in a second, but basically the idea is to update the changes with a child branch (marketing) with changes that have been made to the parent branch (master). In preparing to launch the updates to the marketing site I decided to do a git-rebase. Earlier in the day I had made a small update to the master branch to fix a small bug. We use Git for all of our version control.įollowing standard Git practice, I was working on "marketing" branch that I had created from our "master" branch. ScreenSteps Live is entirely programmed in Ruby on Rails, both the web application and the marketing/sign-up area. This had been through many iterations but I felt that I finally had things the way I wanted them. Yesterday was adding the finishing touches to a marketing redesign of our site.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |