Question

I worked with a graphic designer that did not clone from my github account. He downloaded the project from source rather than using the command “git clone”. Since he pulled his files, a month has gone by and I want to do the following tasks:

1. Create a new branch
2. Push the graphic designers project into that branch
3. Merge his branch with Master

I’ve tried the following the github forking guide with not much luck; when I attempt to push the files into a new branch I get an error: fatal: Not a git repository (or any of the parent directories): .git

How do I do this?

Answer 1

You can do this using an existing checkout. First, create a branch to store the designer’s changes:

git checkout -b graphics

Next, copy his files on top of the existing files in that project. You can use git status to confirm that you’ve got all the files. Then, commit the changes to that new branch.

You can then merge that branch into master using the usual merge methods.