I have a client that has a website which design is switched depending of the season (summer/winder). So basically it is the same functionality, but two versions of the template related files (css, JS, ...

As far as I understand a GIT wokflow is described in the following way: http://nvie.com/posts/a-successful-git-branching-model/
I have a question related to old branches bugfixing in this workflow.
...

We have this problem that could be raised by merge workflow so we are considering using rebase workflow instead.
One concern is that rebase on remote repository results in rewrite of history. But I ...

We've a new junior developer to join the team and want to contribute to a project. The issue is, we expect a lot of garbage commits due to the lack of experience and we need to do code-review on every ...

The workflow in my team is as follows:
At any time, we have more than one active branch; the development lands in 2 or more branches in parallel, for two different versions of an application (let's ...

I am fairly new to git and I am trying to figure out why my workflow deleted the work that other people have done. The workflow is as follows:
I am working on some bugs on my local master branch. (I ...

I understand that the typical Git workflow is a three step process: (modify files in work tree) -> (modify the index with git add/rm/etc) -> (run git commit).
However, why doesn't Git just treat the ...

Нi. I'm fairly new to Git, but we're going to use it in our project and looking for convenient workflow. The Gitflow is rather good for us (http://nvie.com/posts/a-successful-git-branching-model/), ...

I'm working on a team where we have a branch called development.From the branch I created another local branch on my own computer.When I'm on the local branch, what is the difference between running ...

There are two branches:
- production branch which contains product accepted by customer
- develop branch where developers perform their creepy experiments
Once upon a time young developer decided to ...

I am working with a developer that is new to git, and I would like to setup a git workflow that would let me auditing the commits made by this developer (and possibly reject them) without forcing him ...

I want to pull from a repository, and I trust that any change-sets from that repository which collide with mine, are the better option.
How do I automate the pull, so that I don't have to deal with ...

I have one dev branch and several feature branches. I found this git workflow on Atlassian.
THe idea is the dev branch will be read only for all developers except for the moderator(s). All developers ...

I'm liking a lot "a simple git branching model". It keeps the master clean, history nicely formatted and informative, you can do code reviews on feature pushes, etc. But I'm confused with one aspect ...

I have two rooms in which I maintain some source code using git, a "dev" room where most development happens and a "deploy" room in which we actually use the software. Inevitably some changes happen ...

I recently made a mistake with my git merge strategy, and didn't notice the result error(s) until I had already continued to work on the project and made more commits. For the sake of brevity, let's ...

So I'm interested in opinions about my current GIT workflow (which I'm new to), and how to determine which of my changes have not yet been merged/pushed to the appropriate repositories. So first off, ...

Here's generally speaking (I can provide more details), our workflow:
1) We have a prime repo on a remote server host.
2) We have a bare repo on a remote server host.
3) We have a clone of the bare ...

We have an opensource project on Github. We are about to deploy on a production server which also uses Git.
Now here is the issue: should we need to use different Git repos for dev and production or ...

Following Nvie's git branching model, why do I end up with 'develop' and 'master' each 1 ahead and 1 behind the other after merging the same 'release' branch into both? If the same 'release' branch is ...

When I started working with git I based my workflow on the Gitflow model: http://nvie.com/posts/a-successful-git-branching-model/. I thought main idea was to keep commits to appropriate branches; so ...

My current development environment uses git for VCS, and we use a feature branching workflow. I would like to get to a point where statistics can be generated about each feature. Mainly, I would like ...

Which is the preferred way when working in teams on a github project? Should each member have it's own fork or should I create an organisation where the main project is and everyone in the team makes ...

At my workplace, we are attempting to design a workflow based around Git to handle our deployments and changes to the code.
We have a Java EE web application and 3 deployment environments (Test, QA ...

I have project A, which includes a local fork of project B.
This is, project B's potentially modified sources are included in a subtree of project A.
Project A uses svn, project B uses git.
Using git ...

I have some puzzle pieces and it would be great if someone could help to master the pieces together to have a whole picture.
I have a couple of devs who develop on several git repo's locally and push ...

I've recently dived into Git and maybe I'm over complicating this but I'm trying to figure out the best workflow for the following:
I have created a 'backbone' or 'base' of sorts for themes similar ...