Git: Import Changes From Non Git Repository
- Local git repo, default master branch
- FTP server with content of the repo (non git), synchronized daily with the local repo, master branch
- user1 is working on local git repo (git add, working directory clean)
- user2 (non git user) changed files directly on the FTP server
How can I import all files changed on FTP to the local git repo and see what has changed?
It sounds a bit nightmarish. I assume it is no option to have a git repository on the FTP server. In that case I would create a separate branch in my work repository:
git checkout -b ftp
copy the ftp stuff over and commit it to the branch:
git commit -a
then go back to the master:
git checkout master
and do the normal merge, diff, cherry-pick from the FTP branch. You might want to delete the FTP directory after merging is done.
- → Authenticate with a cookie using laravel 5.1 and jwt
- → Finding a specific GitLab tag from PHP
- → React: How to publish page on server using React-starter-kit
- → babel-loader, webpack, ES2015 modules: "Element type is invalid"
- → Create a function-attribute of a function, which is, in its turn, a method of an object literal
- → Model Validation in laravel 5.1 not working
- → GIT fatal: loose object
- → Laravel validation required rule not working
- → Axios array map callback
- → Where does this `webpack://` come from for `webpack-dev-middleware`?
- → error when trying to modify project in laravel forge
- → GitHub Pages and Jekyll content duplication and SEO issues
- → Use Laravel repositories with Datatables