| * 07a2a46 | Updated index. It should look as if we rewound the repository to a point in time, prior to any mergers. Right now we need to reset the master branch to the "Added README" branch. The "Added README" commit goes directly before the conflicting interactive mode we added. * 8c32287 | Added standard HTML page tags (v1-beta) * 454ec68 | Life is great! (HEAD, master) This allows us to demonstrate the rebase command without having to worry about conflicts. Let’s revert the changes in the master branch up to the point before the conflict change was made. The interactive mode we added to the master branch has become a change conflicting with the changes in the style branch.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |