Git is an open-source DVCS (Distributed Version Control System)

learn more… | top users | synonyms

5
votes
1answer
341 views

Team Git workflow working with a multi-project Sitecore solution using TDS

We are a team of 8-10 developers working on different parts of a Sitecore instance. In the past we've used SVN and more recently (and successfully) Hg, but are moving to using Git as our primary ...
0
votes
1answer
152 views

using pre-commit / post-merge hook script to replace configuration values

I'm having some problem developing a web application with various developers, each one has an specific configuration to work. and i would like to use the less resource cosuming approach to avoid that ...
4
votes
2answers
190 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 ...
3
votes
6answers
895 views

How do you handle multiple developer configuration in a project?

I've been thinking lately about how I handle config changes between multiple developers on a project. Specifically here about a Laravel project in PHP, but I guess this applies largely to all ...
3
votes
4answers
470 views

How to minimize merge conflicts when using non-lock VCS like git?

I have been using git for about four months now. While I like most of its features, I find it rather inconvenient that multiple developers can make concurrent changes to the same file and then a need ...
3
votes
2answers
209 views

GIT and different versions of a project: what are the best practices?

I'm very new in using GIT as a versioning system and despite a lot of searches, I can't seem to really understand how to handle my scenario. I have this web project that needs to be developed in two ...
2
votes
1answer
226 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 ...
30
votes
5answers
4k views

Why do so many websites prefer “git rebase” over “git merge”?

One of the advantages of using a DVCS is the edit-commit-merge workflow (over edit-merge-commit often enforced by a CVCS). Allowing each unique change to be recorded in the repository independent of ...
9
votes
2answers
525 views

What's the best Git workflow for working with an open source project with employer-specific changes?

At my current employer, we are using an open-source project hosted on Github as a component of our application. I have been working on this project to both add some features that we need and to ...
3
votes
2answers
126 views

Managing codebase for basic and pro edition of a project

I have a project which will have basic and professional edition. The professional edition will have all the features of the basic edition. I am using git to manage the project's codebase. I consider ...
1
vote
2answers
192 views

Finish feature reverted commits from develop

I am using git as a version control system, and using git-flow as the branching model. I started a feature branch some weeks ago in order to maintain the system in a clean state while developping that ...
1
vote
3answers
332 views

How do I set up pairing email addresses?

Our team uses the Ruby gem hitch to manage pairing. You set it up with a group email address (e.g. dev@mycompany.com) and then tell it who is pairing: $ hitch james tiffany Hitch then sets your Git ...
1
vote
3answers
413 views

Organisation GitHub account. Secure to use for personal projects?

So a large client of mine gave me access to their Organisation GitHub account. With it came a login for myself (on github.companyname.com) and of course access to certain repos on their company ...
39
votes
10answers
11k views

Why “Fork me on GitHub”?

I understand how GitHub works, but one thing I've been confused about is, why almost every OSS project lately has a "Fork me on GitHub" link on their homepage. For example, http://jqtjs.com/, ...
1
vote
1answer
985 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 ...
18
votes
3answers
2k views

Strategy for code review before merge to master from feature branches

Me and my team use feature branches (with git). I'm wondering which is the best strategy for code review before merge to master. I checkout a new branch from master, lets call it fb_#1 I commit a ...
1
vote
1answer
231 views

Why doesn't Git daemon start in the background? [closed]

Just as in the title, why doesn't git daemon start the service in the background, since it's a "daemon", being a background process? I know that I can start it in the background using git daemon ...
14
votes
1answer
480 views

Etiquette for editing someone's pull request

I own a repository on GitHub to which someone sent a pull request with one single commit. I only want to implement his solution partially, and use about half of the code changes the user made. What ...
3
votes
1answer
84 views

Could a reflog replace tags for bookkeeping?

My repository has a branch production and is filled with countless tags of the format production-20130101-1234 that point to what has been actually shipped on the given datetime. I think this ...
1
vote
2answers
308 views

Two or one git repo for Android app + web service backend?

I'm wondering what the best practice is for my git repository structure where I have an Android application + a web service backend. In general, I'd like to release these two independently (e.g., perf ...
12
votes
4answers
4k views

Why do git commits not contain the name of the branch they were created on?

When working with git in a team using feature branches, I often find it difficult to understand the branch structure in history. Example: Let's say there was a feature branch feature/make-coffee, ...
1
vote
1answer
210 views

which directory to initialize git repo

I'm just getting started with Git. I'll be doing PHP development and was wondering if I should initialize my repo within my server root folder, or any directory on my hard drive and publish my ...
0
votes
2answers
222 views

Git temporary code-change

My program interacts with another application via a socket communication. The current public version of this application does not support a specific command while the newest trunk does. To be ...
0
votes
2answers
115 views

Distributing a data access solution across multiple solutions

I have 3 solutions, one of them is a dataccess solution with all the repositories etc. At the moment when a change is made to it, the others have to go get the latest nuget version locally, we have a ...
39
votes
1answer
2k views

What are the advantages and disadvantages of cryptographically signing commits and tags in Git?

So someone peer reviewed my work, and he told me that I should always sign my commits and tags cryptographically. When asked why, he didn't know to explain it to me, and said "It's just a good thing ...
6
votes
1answer
3k views

GitHub Organizations for a project spanning multiple repositories?

I've started a project that involves at least three repositories on GitHub. One of the repositories is a generic documentation-and-examples dump, and the other two contain the implementation of two ...
28
votes
11answers
2k views

Is it ever OK to commit non-working code?

Is it good idea to require to commit only working code? This commit doesn't need to leave the repository in a working state as: ... we are in early design stages, the code is not yet stable. ...
3
votes
2answers
84 views

Placing images into Git for a CRM

I have built this CMS that has the option to add entries to the database. Each entry that is created has about 5 to 10 new images showing the product for sale. Each image is about 150Kb in size. I ...
8
votes
1answer
5k views

How to make a “git push” update files on your web host?

I have a few sites which are all hosted on the same web hosting service under shared hosting. My web host supports Git and I have SSH access to it, and I also have Git setup on my laptop as well. I ...
4
votes
2answers
665 views

Git Staging: When to stage? What to do if modification occurs afterwards

I'm rather new to the broad world of Git. I have read the manual and have been practicing but I am confused about few aspects of it, which I couldn't figure out after searching for. I'm wondering: ...
1
vote
1answer
190 views

Using Git - better to do lot of incremental updates or one big daily update? [duplicate]

Ive just started working with Git (Github) in anticipation for an up coming project I'm project managing and designing and developing the front end of. One thing I couldn't work out is, is it ...
17
votes
1answer
915 views

My github pull request was merged, what's the convention at this stage?

I forked a project on Github, made a small change and sent a pull request to the original maintainer, who has pulled it in. Now the last commit there is Merged pull request #11 from ...
7
votes
2answers
893 views

Git for a solo developer [duplicate]

I'm a developer working on a Wordpress project. I work on this alone and I want to improve the way I use Git but I don't know where to start. Currently, I'm using git to commit all of the work that ...
1
vote
0answers
140 views

GitShell, how can I not type the username and passwords?

Open the CMD, and I should type the password and usename? In the GitShell opened by shortcut, I don't need to type the username and password. Related is here: How can I convert GitShell's ...
30
votes
6answers
1k views

Are Frequent Complicated Merge Conflicts A Sign of Problems?

On our team, we use Git as our source control. We have several areas of code that are almost independent but have some overlap. Lately we have been discussing workflows and approaches to using source ...
10
votes
4answers
8k views

How to evaluate moving to Team Foundation Server

My development team presently uses the following software in our workflow: JIRA Bamboo (Atlassian continuous integration) Greenhopper (Atlassian agile project management) Confluence Git, hosted on ...
0
votes
2answers
1k views

When should we clean up old, no longer used GIT branches? [duplicate]

We have several bugfix branches that are starting to pile up. They have been merged into master, and deployed to production. Is there a good benchmark for when these branches should be cleaned up? ...
10
votes
3answers
243 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
3k views

Organizing a git repository with several projects sharing code

I have several small projects running on different embedded hardware, and about 50% of their code is identical (typically some drivers, their operating system, and some libraries). I want to merge ...
32
votes
8answers
35k views

Using multiple Git repositories instead of a single one containing many apps from different teams? [duplicate]

I am migrating a 10-years-old big CVS repository to Git. It seemed obvious to split this multiple-projects repository into several Git ones. But the decision-makers are used to CVS, therefore their ...
1
vote
1answer
223 views

Under what conditions should I rebase rather than merge?

Here is, roughly, our structure of work using git, for web development. We have a master branch, and individual or groups of work are done seperately in branches, then merged in. A ticket (or ...
5
votes
2answers
151 views

How can I look at a GitHub repository and know what version of the code to download?

I am new to GitHub and new to the open source world (coming from .NET). I have a media wiki site and want to install a Google analytics extension: ...
66
votes
6answers
6k views

Why does git use hashes instead of revision numbers?

I always wondered why git prefers hashes over revision numbers. Revision numbers are much clearer and easier to refer to (in my opinion): There is a difference between telling someone to take a look ...
4
votes
1answer
106 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
1answer
120 views

GIT Permissions [closed]

There is something not clear for me and this is how to prevent other people read my code. The thing is that I want people create their own branches but not to view the other's branches. If someone is ...
5
votes
1answer
149 views

Can the version of Git vary between team members?

We are about 40 developers working on the same code base and we use Git for version control. My question is: can there be problems if, for example, some developers have a much older version of Git ...
6
votes
1answer
700 views

Best way to convert existing project to be open source in GitHub

I've been working on a personal closed source project for some time and would like to make it open source. I've never created my own open source project before so it will be a good learning ...
7
votes
2answers
1k views

How to convert a Bazaar repository to GIT repository?

We have a large bazaar repository and we want to convert it to a git repository. The bazaar repository contains the folders of each of the interns. Any documentation/code prepared by interns is ...
22
votes
6answers
2k views

What does “branching is free” mean in Git?

What does "branching is free" mean in Git? I hear this a lot whenever Git is mentioned in comparison to other version control systems. I haven't had the opportunity (?) to deal with others (SVN, ...
1
vote
1answer
113 views

Git tracks _lines_ of code. Is there something that track _words_?

In git if I change a character in a line the entire line is considered changed. I don't know much but stackexchange seem to track changes in a word-by-word basis in the edit history. Is there an ...