Geek Answers Handbook

Next Steps with Git: Creating a Cohesive Workflow

I am new to git and distributed version control, but without a lot of stumbling with initmy own local source, I set up a private remote repository (source) via ssh on my own website and did basic pulland pushfrom basic to source. (I even test the clone!)

I think I'm managing a unidirectional, git workflow. Now, however, I'm starting to think about how I handle the movement between development, beta, and production. Most of the tutorials that I found focus on merging and cloning different users, as well as how to pull and push, but in my case, it's just me, processing things from different sources.

Expecting an experienced git user to give some insight into my workflow and give some suggestions on how they will handle merging, branches, etc. (which I still do not know / comfortable).

Below are the different cars / locations:

  • Remote git repository: ssh: // git @ example.com / git / myproject.git
  • Home web server, the main development unit (where I sit privately and do most of the work).
  • Remote web server, beta testing (public framing): http://beta.example.com (test my dev work before production)
  • Remote web server, production site: http://example.com (where, in our opinion, real people use the site)
  • (Sometimes) when traveling on a laptop (with its own local web server).

? .

+5
3

, "" IMHO.

, , , "". , "". , (, -), , - . , , ...

A/B (, ): , , A B . , A "", "17". , " 18" "20". "" "17", 18-20, . " " git.

, B, " " , A . , : A , , B A, ...

, .

+5

, , . Git , , , . ' - ​​ .

+2

Yes, it can handle the change from A, the other from B, and by clicking. However, one of the two will have to be pulled out of the source before it can click. Because one of the two would be "obsolete" with the origin, because the other was moved to its original position.

+1
source

More articles:


All Articles