2
votes
1answer
92 views

Best Git workflow suitable for our needs

I need help with the workflow that is best suitable for our needs. We are a 3-4 person team and are working on 4 different projects. We have three main branches: master - deployable production ...
13
votes
4answers
592 views

Is using Git Stash as a workflow an antipattern?

I've recently been looking at how me and my team uses Git and how our workflows work. We currently use a feature-branch workflow which seems to work well. I've also seen some individuals on our team ...
3
votes
1answer
87 views

How to cleanly add after-the-fact commits from the same feature into git tree

I am one of two developers on a system. I make most of the commits at this time period. My current git workflow is as such: there is master branch only (no develop/release) I make a new branch ...
5
votes
3answers
245 views

How can a manager ensure developers are pushing up to the origin every day?

Our team has been using Git for a couple of years. I love it, after previously using Visual Source Safe, SVN and TFS. However, my manager has been getting increasingly agitated about it and is ...
6
votes
3answers
203 views

Advice Needed: Developers blocked by waiting on code to merge from another branch using GitFlow

Our team just made the switch from FogBugz & Kiln/Mercurial to Jira & Stash/Git. We are using the Git Flow model for branching, adding subtask branches off of feature branches (relating to ...
4
votes
1answer
83 views

Git work-flow for uncertain premise (pending decision)

I am not quite sure, how to name my problem. But I will start with how I usually used git. I am working as a single developer on one git repository. Usually I make feature-branches from master, and ...
3
votes
5answers
235 views

Dealing with a large pull request

I'm currently working on a project with a team that's using a git workflow. It's fairly simple, master should be in a deployable state and branches are used to create features and hotfixes. Whenever ...
1
vote
1answer
125 views

Should we be using git branches or separate repositories?

So I have talked my employer into finally jumping on version control...up until now my experience with git has been for personal projects and freelance work where everything is on one server, or small ...
4
votes
2answers
158 views

Sharing only part of code with git

The situation I have code which has features X and Y. Bob needs access to the code to help develop feature X further. Normally I would allow Bob to clone the code, but the problem is that feature Y ...
2
votes
1answer
154 views

What workflow do you find efficient when simultaneously developing multiple inter-dependent GIT branches? [closed]

Let me start by saying that my GIT knowledge is fairly shallow, so I'm guessing that there might be something I'm missing. THE SETUP: As an example, we have a project which is being developed as a ...
1
vote
1answer
511 views

How to maintain a forked git repo with feature branches that upstream won't pull?

So here's a typical workflow on Github... Like some project -> fork it -> git clone https://github.com/you/someproject. Open project. Like what you see, but make some changes. Having been ...
10
votes
3answers
189 views

Which is better for small bug fixes and small features - naming branches by ticket number or naming them by feature description?

I am in the middle of a disagreement (cordial, of course) with my lead about proper branch naming. This applies to bug-fix and small feature branches, not long-running feature branches. For ...
4
votes
1answer
103 views

Need a transition from my workflow, or make it better / fix it

This is how I roll with git: I clone/fork something locally I create a new branch devel. This is supposed to be a quickfix branch. It is also supposed to be parent to all branches. I create a topic ...
2
votes
2answers
117 views

What could be the use of forking a repository in a github's organization?

I'm trying to figure it out some nice workflow for our company, and we have so far the main repository on the github's organization account and we all, the members of the team working on the branches ...
0
votes
2answers
206 views

Working with Multiple Versions of Websites (Git)

I have a main template like website I have made that will allow me to quickly roll out and make new websites on demand when I need them, for my personal use. I'm wondering what is the best practice ...
2
votes
2answers
1k views

So I'm a developing a workflow with vagrant+git…does this make sense?

Relevant Background Details We've got two types of VMs (Utility Boxes & Web Servers) that developers need. We are going to be using git for version control. We have developers who have ...
4
votes
2answers
185 views

Managing an undercover SVN repository

The project I am working on is version controlled by SVN, and the unspoken rule at work is to commit only when a new stable feature is added (in order to have a "clean" revision history with no ...
2
votes
1answer
185 views

Git Workflow - turning a local reposity into a “central” one

I have a local repository with a toy project that has turned out to be more serious than I had thought. So from a single development branch where I have carelessly committed, I have started to use ...
8
votes
2answers
3k views

Is a merging strategy like Git Flow really an anti-pattern?

My company is using Git, and is using a peculiar branching scheme - work is done in master, and branches are reserved for releases. This works fine, so long as all of the work done in an iteration ...
2
votes
3answers
537 views

Pushing a new version of a live web application in a Git based workflow

I have a question regarding workflow in web development. I'm building my project in Symfony, and it's in Git. Right now, I have three environments, dev (local), staging and prod. The project itself ...
1
vote
1answer
97 views

Keeping up with upstream changes while adding small fixes or even major changes

Often I need to apply some small fixes (to make them run on my environment) or even change some parts of the software (to tailor it to my needs) to software from outside. However this obviously ...
5
votes
3answers
1k views

Git workflow for small teams

I'm working on a git workflow to implement in a small team. The core ideas in the workflow: there is a shared project master that all team members can write to all development is done exclusively on ...
0
votes
2answers
237 views

Github Workflow: Pushing small fix branches to remote, or keep them local?

In Scott Chacon's workflow (explained eg in this SO answer), with essentially two silos (development, and master), if, say I have a small bug to fix (e.g. can be fixed with a few characters) is the ...
2
votes
1answer
195 views

Tracking work history in a git repo

Previous related questions: Code bases for desktop and mobile versions of the same app Git branching and tagging best practices Question: I have split my repo into three directories (swing, ...
12
votes
1answer
1k views

Git workflow / practices for a small project (flowchart in png)

I'm trying to come up with a personal workflow. I've put together a flowchart of the hypothetical lifespan of a release: one developer pushing to a public github repo + a friend helping with some ...
2
votes
3answers
2k views

BitBucket working with multiple developers on same project

I am new to BitBucket. I have my repository. And 2 people working on it me, Admin and another developer with Read only access. So in order for him to do changes he forked repository and made changes, ...
6
votes
4answers
2k views

Working with Git on multiple machines

This may sound a bit strange, but I'm wondering about a good way to work in Git from multiple machines networked together in some way. It looks to me like I have two options, and I can see benefits on ...
6
votes
5answers
926 views

What is an effective git process for managing our central code library?

Quick background: we're a small web agency (3-6 developers at any one time) developing small to medium sized Symfony 1.4 sites. We've used git for a year now, but have previously used Subversion. For ...
1
vote
1answer
253 views

How should my local git workflow work?

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 ...
7
votes
2answers
4k views

git, maven and jenkins - versioning, dev and release builds workflow

What is the preferred way to do the following with git, maven and jenkins: I am developping an application, which I would like to maintain "dev" and "release" branches. I would like jenkins to build ...
6
votes
2answers
4k views

Examples of continuous integration workflow using git

Can anyone provide a rough outline of their git workflow that complies with continuous integration. E.g. How do you branch? Do you fast forward commits to the master branch? I am primarily working ...
9
votes
3answers
1k views

Github Organization Repositories, Issues, Multiple Developers, and Forking - Best Workflow Practices

A weird title, yes, but I've got a bit of ground to cover I think. We have an organization account on github with private repositories. We want to use github's native issues/pull-requests features ...
7
votes
6answers
1k views

Best way to use source control for a project (1-3 people)

So my partner and I are working on a practice management system and at first we didn't use any version control, then I persuaded him to use git. At the moment our system is that we have three ...
4
votes
4answers
353 views

How can I get programmers to work together better on shared code with tests

We keep repeating "you have to pull first" (this is git and github by the way). Then you code a little, then get your tests to pass, then commit, then pull and push again. We give tutorial links, ...
5
votes
3answers
671 views

What should be the workflow with a git repository?

I work on several git repositories though on most not more than 2 people work. Mostly me and my boss. Very often when we work in parallel it happens that "git log" doesn't look so nice because of the ...
5
votes
2answers
1k views

Git workflow - advise a newbie

I'm starting to work with git for the first time, and I'm trying to come up with a workflow that works for me, so I thought of coming and asking around. Right now, I'm in a couple of projects where ...
8
votes
3answers
779 views

How to transfer files to production?

We are a group that started working on a fairly big website with an existing codebase. We have a test and a production server. Our idea is to have a test repository with a number of devs having push ...
5
votes
6answers
664 views

Help us with our git workflow

We have a web application that gets deployed to multiple regions around our state. An instance of the application for each region. We maintain a staging and production (master) branch in our ...
10
votes
5answers
1k views

Are There Any Flaws With This Git Branching Model?

I am asking about this git branching model or workflow. I really like this. It strikes me as very intuitive and productive, but what I am asking for is whether there are any flaws or negatives to this ...
6
votes
1answer
3k views

Workflow on Development and Production Servers for a Consistently Updating Website

We have three developers, one system administrator, and an artist that primarily work on a single website (forum) on our spare time to consistently develop features for the forum (but there are other ...
62
votes
4answers
10k views

What is the benefit of git's two-stage commit process (staging)?

I'm learning git and I've noticed that it has a two-step commit process: git add <files> git commit The first step places revisions into what's called a "staging area" or "index". What I'm ...
12
votes
2answers
2k views

How can one use git-flow effectively on a project in which more than one major version is being maintained?

I've migrated several of my projects over to the git flow work flow, and I'm loving it. However, I haven't found a best practice that keeps things flowing as smoothly when working with a project in ...