I am quite new to git and version control in general, and have question about moving files around. I have a master repo on GitHub, with 6 source files.
I’ve done a lot of work on the project and now my local branch contains two folders with the sources in those.
The directory structure used to be like:
Master:
- File 1
- File 2
- File 3
- File 4
- File 5
- File 6
Where as my local branch now looks like this:
New Folder 1:
- New File 1
- New File 2
- New File 3
New Folder 2:
- File 1
- File 2
- File 3
- File 4
- File 5
- File 6
How can I move my local structure to the master branch without losing my commit history on the old files?
Just commit. Git blame etc will generally do a pretty good job of automatically detecting moves.