将Git与现有文件一起使用，并在推送后更新分支

Question

we are currently starting to work with Git and run into some trouble.

Baiscally what i want is to have a Git-Repository that users can push to and pull from.

Also this repository should work as Preview Version of the master branch, so we need to have the script files in the repository itself.

I initiated the repository with "git init test.git". So it's not a bare repo.

Question is how to setup git that it holds the current version of the master branch as real files and i can setup a url to reach the current master branch of the repository.

When i create a repository and try to push to it i get an error that the current master branch is checked out on the repository and i cant push to it.

Any ideas?

Answer 1

You must not push to a non bare repository! You cannot push to a checked out branch!

Now given you situation my suggestion is:

Keep a blessed bare repository! Do all your development on the local, merge/rebase on master and then push to blessed bare.

You can write the post-receive hook of the blessed bare that it has a code/runs a script that has code to cd into your production repo, and pull from blessed bare.(it will be a fast-forward as you might have resolved conflicts before pushing to blessed bare)

This way, on every push to 'blessed bare', you pull into the production and update the checked out master!

Hope this solves the problem.

Happy gitting!

Answer 2

根据您的描述，我认为实施称为GitFlow的分支策略可能对您有用 。