How should my local git workflow work?

Posted by Anonymous - on Programmers See other posts from Programmers or by Anonymous -
Published on 2012-06-09T09:39:05Z Indexed on 2012/06/09 10:47 UTC
Read the original article Hit count: 228

Filed under:

git

|

Workflows

|

server

At home, I have a server that is running some software (on a LAMP stack, but only accessible internally). I have another machine and a laptop that I both use for developing said software. What is the best workflow for me?

Should I have a repository on my local server, create a live branch, staging branch and development branch, then checkout the development branch from my laptop/development PC to work on, commit that back when I'm done, then merge the development branch with the staging branch for testing, before further merging to the live branch?

Would I simply checkout the production branch to my /www/var/ on my server?

Or am I thinking/going about this all wrong?

Thanks.

© Programmers or respective owner

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More

Related posts about Workflows

SharePoint Quick Start FAQ Part 6 – Workflows, Workflows and Workflows

as seen on Code Project - Search for 'Code Project'
SharePoint Quick Start FAQ Part 6 – Workflows, Workflows and Workflows >>> More
Programming user interfaces using F# workflows

as seen on Dot net Slackers - Search for 'Dot net Slackers'
F# asynchronous workflows can be used to solve a wide range of programming problems. In this article we'll look how to use asynchronous workflows for elegantly expressing the control flow of interaction with the user. We'll also look at clear functional way for encoding drag&drop-like algorithm. >>> More
How to Create Custom SharePoint Workflows in Visual Studio 2008

as seen on Simple Talk - Search for 'Simple Talk'
Whereas simple workflows are possible using Microsoft Office SharePoint Designer, you will soon reach the point where you will need to use Visual Studio. In the third article in Charles' introduction to Workflows in Sharepoint, he demonstrates how to create a workflow from scratch using Visual Studio… >>> More
How to fix “Add Host to Workflow Farm problem” when installing Windows Azure Workflow in SharePoint2013 Preview

as seen on YBBest - Search for 'YBBest'
Problem: When I try to configure the windows Azure workflow in SharePoint2013 preview, I got the following error see screenshot below. Detailed log can be found here. Solution: I asked the question in SharePoint StackExchange , Rajat’s help me to fix the problem .The solution for this is quite… >>> More
How to fix “Add Host to Workflow Farm problem” when installing Windows Azure Workflow in SharePoint2013 Preview

as seen on YBBest - Search for 'YBBest'
Problem: When I try to configure the windows Azure workflow in SharePoint2013 preview, I got the following error see screenshot below. Detailed log can be found here. Solution: I asked the question in SharePoint StackExchange , Rajat’s help me to fix the problem .The solution for this is quite… >>> More