NOTE: Do not yet run any of the commands below at this stage. To do this, we will make use of the move ( mv ) command: With this in place, I simply need to move everything in the root directory to the subdirectory. The first step is to create our new subdirectory. To get started, I need to clone the repo we want to merge into dom- examples. This will allow me to safely merge it into dom-examples as everything is contained in a subfolder already. What do I mean by that? I need to create a new directory in the root of the sw-test repo called service-worker/sw-test and move all relevant files into this new subdirectory. Then it hit me! I need to prepare the service worker repo to be moved. I searched around some more to see if anyone else had run into this same situation but did not find an answer. With the current setup, I could continue from the git remote command, but I wondered if the current directory contained files or folders that would conflict with those in the service worker repository. Merge pull request #142 from mdn/sideshowbarker/webgl-demo-add-playsInline-drop-autoplay Merge pull request #143 from mdn/sideshowbarker/webgl-sample6-UNPACK_FLIP_Y_WEBGL Running git log on this repository, I see the following commit history: commit cdfd2aeb93cb4bd8456345881997fcec1057efbb (HEAD -> master, upstream/master) step as my target repository already had some history, so I started as follows: git clone I could skip everything up to the git remote. # Merge the files from old_a/master into new/master # Add a remote for and fetch the old repo # Before we do a merge, we need to have an initial commit, so we’ll make a dummy commit This is how Eric describes the first steps: # Assume the current directory is where we want the new repository to be created For the experiment, I used the sw-test repository that is meant to be merged into the dom-examples repository.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |