Question

If I downloaded a sample project (not Git managed) on a website and I created a branch and some commits to this project. Then, the original author made some updates to this project and published on the website…

Now how can I merge this update (not Git managed) to my Git managed project??

I am new user of VCS/Git.

Thanks.
Raymond

Answer 1

Make a second branch that starts at the original SHA you started from (before you made any changes).

Check out that branch.

Replace the contents of the working directory with the new version of the outside code.

git add . and git add -u to stage all of the changes and removals.

Commit.

Check out your original branch, and merge the second branch in.