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

learn more… | top users | synonyms

5
votes
1answer
198 views

Avoiding the Grid of Doom™ in Git-Flow

My project follows the Git Flow branching model. Development happens on develop, which is merged into master and tagged there for releases. Hotfixes happen in branches branched off the current master. ...
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 ...
1
vote
1answer
83 views

Why do I have to run git add after making changes?

I started using git when I was studying for small projects and then the workflow was git add file when having made a new file and then git commit -m ... for subsequent changes. Now I'm in a new ...
0
votes
1answer
63 views

PHP and Subversion workflow [duplicate]

I'm working on a project in a small team at the moment working on a webapp. We originally had 3 on the team with a lead dev and now we've grown to 7 and a lead dev. At the moment our workflow is ...
0
votes
2answers
80 views

Best workflow for a web development team to work on a large amount of projects simultaneously? [duplicate]

We're a team of web developers, and as the number of projects we're working on has grown and continues to, things are starting to get messy. What we currently do is work on a locally shared folder ...
85
votes
4answers
14k 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 ...
13
votes
3answers
4k views

How can I organize personal git repositories?

I'm in the process of setting up a GitHub account with the plan of making a pair of libraries I developed as parts of some recent iOS projects freely available for other iOS devs to use. I don't ...
-1
votes
1answer
100 views

Best practices in managing nuget repositories [closed]

I've been involved in a project using Visual Studio 2012 that has multiple solutions and multiple projects. In most cases, one solution will have to refer to the library build in a different project. ...
26
votes
9answers
1k views

Commit at a logical checkpoint only, or also when you're at a stopping point? [duplicate]

Life, the work day, and personal projects don't always give us the opportunity the commit code at a logical completion (functionality subset programmed, bug fix completely patched, etc.). Sometimes ...
42
votes
3answers
2k views

Why squash git commits for pull requests?

Why does every serious Github repo I do pull requests for want me to squash my commits into a single commit? I thought the git log was there so you could inspect all your history and see exactly what ...
2
votes
1answer
39 views

Partial or full changelog for release

When releasing a new version of a program is it better to include the full changelog since the beginning of the project or just the part since the last release? I know that the release notes would ...
2
votes
1answer
121 views

forking boilerplates? or simply cloning them?

Using gitlab/github. I created boilerplates for all my projects so I've: wordpress-boilerplate html5-boilerplate laravel-boilerplate ror-boilerplate I'm debating myself if/when starting a new ...
5
votes
2answers
755 views

Why doesn't git merge adjacent lines without conflict?

I recently learned that when merging two branches in git, if there are changes on two adjacent lines git declares this a conflict. For example, if file test.txt has this content: Line 1: A Line 2: B ...
1
vote
2answers
276 views

Move Files Using Git mv Or Use File System Instead

I am wondering what the difference in Git would be if I used the mv command versus moving it in Windows explorer. From Perforce I know it's important because the version system keep track of the file ...
0
votes
2answers
72 views

Should I keep looking through my git history or stop now for these CSS changes? [closed]

So I made a bunch of changes to a Rails codebase I'm working on over a period of a couple of months. Some of these commits inadvertently seem to have changed the CSS layout. The fixes themselves are ...
4
votes
1answer
111 views

What is a good frequency for merging up feature branches to a main line?

We have a very large code base in mercurial. We have about a 6 month release cadence with 2 week sprints. For each release we have about 10 feature branches and maybe 5 or so people working per ...
0
votes
0answers
17 views

What is a good frequency for merging up feature branches to a main line? [duplicate]

We have a very large code base in mercurial. We have about a 6 month release cadence with 2 week sprints. For each release we have about 10 feature branches and maybe 5 or so people working per ...
2
votes
2answers
83 views

Managing Similar Code On Multiple Platforms (GIT)

My team and I have developed a Chrome extension which we are now porting into Firefox. The two versions share enough of a code base that it would be redundant to manage to separate depos. In fact ...
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. ...
0
votes
0answers
64 views

Uploading Processing Sketch with library to github

I have a sketch I wrote in the language Processing that I want to put up on GitHub. It uses a library released under LGPL so from what I understand, I'm able to (and should) upload the library ...
0
votes
2answers
137 views
37
votes
8answers
3k views

Should a git commit message mention the file that was modified?

In the first line of a git commit message I have a habit of mentioning the file that modified if a change doesn't span multiple files, for example: Add [somefunc] to [somefile] Is this a good ...
4
votes
4answers
222 views

Having a production branch or using master?

I work on small team with other remote developers on a Rails application. We are starting to modify our git workflow. We have thought about a branching structure like below: (dev) -> (qa) -> ...
2
votes
1answer
114 views

Git branch usage

I'm working on a small project, and I am using Github as version control. I made a new branch to test something out, and have decided I liked the previous method better (in the master branch). What ...
10
votes
1answer
682 views

When making a fix to an earlier commit, should I rebase or add a separate fix up commit?

A common scenario in software development is code reviewing somebody else's code. A common tool for doing this is opening a Pull Request. My question is, when issues are found in the review, should ...
0
votes
0answers
51 views

Git for web development on server, with “dev” and “productive” folders [duplicate]

This question has been asked before, but none of the answers could help me in my case. I am developing a web application in PHP and JS. The workflow as it is today is the following: There are two ...
1
vote
3answers
165 views

How to version control a running web application? [duplicate]

I am developing a web application in PHP and JS. The software until recently was only being developed on and not being used by clients, so I could just change the script files directly. After the ...
4
votes
1answer
276 views

If I fork a project on Github that is licensed under MIT, how to I handle the attribution and copyright notice?

If I plan to fork an MIT project and significantly modify and rename it, how do I handle the copyright notice above the MIT license on the main License file. Would I list the original author and my ...
2
votes
1answer
91 views

Is it redundant and unnecessary to do file backups of a repository that has a remote repo?

Is it redundant and unnecessary to periodically backup the files in a Git repo, that also has a remote repo? My understanding is all repositories are full backups. So an individual developer with a ...
0
votes
1answer
52 views

Upgrading inherited 3rd party code with changes [closed]

I inherited a php project of 3rd party code with a good deal of company-specific customization lumped on top of it. Now I've got to upgrade it and the person who owned the project is the one I've ...
4
votes
1answer
127 views

How to reconcile “misc fix” commits with pull requests?

I work in a small company, where I used to be the only developer. We recently welcomed a few other people on the team, and started thinking about how to organize development efforts. I am pretty much ...
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 ...
1
vote
1answer
75 views

How to manage legacy code in branches?

I have a website application which was developed and versioned using Git. A new version of the site was developed from the base of the older site. The 'legacy' site lives in master and the new ...
1
vote
1answer
80 views

To One Repository or Two

I have a C codebase which supports a number of build personalities, for a given board architecture. It's mostly in maintenance mode. We don't do new active development on it. We have a new board for ...
1
vote
0answers
60 views

How to credit authors when open sourcing a fresh snapshot of a private repo?

I've read through How to open-source a project whose git repository has copyrighted media in the history? but my question is: how to credit authors when open sourcing a fresh snapshot of a private ...
2
votes
4answers
196 views

Advice on new git / deployment workflow

I work with a small team that until recently didn't use source control. I'm working on the layout of our development/deployment workflow with git. I would appreciate and advice or insight you might ...
2
votes
2answers
196 views

Should I backup gradle dependencies to git?

I always like to backup project dependencies myself in case they can't be resolved due to a down website or because certain versions aren't available for download any more. Should I trust the maven ...
1
vote
1answer
55 views

Global gitignore v project [closed]

We have several web projects within our organisation - using different frameworks and with many different developers. Each developer might use a different ide and use different operating system etc ...
2
votes
0answers
147 views

Visual Studio, Git, and common code

I'm looking for some advice on how I should arrange a large new project I'm working on to allow it be more easily managed in Git (using GitLab), and developed in Visual Studio. To give an idea of ...
6
votes
6answers
4k views

What's so difficult about SVN merges?

Possible Duplicate: I’m a Subversion geek, why should I consider or not consider Mercurial or Git or any other DVCS? Every once in a while, you hear someone saying that distributed version ...
0
votes
0answers
49 views

Keep dependencies in git repo or not? [duplicate]

Im used to composer, gems, npm and apt. So i was happy to learn in frontend we have bower now :) But do you save bower components in repistory or not? I never save composer packages in repo, to ...
2
votes
2answers
102 views

Should I keep font assets in git repo?

Switched from svn to git, and I can feel that several repos with heavy assets feel, well, heavy. I never noticed this heaviness with svn. There is a huge difference when checking out whole history of ...
0
votes
1answer
41 views

git strategy on merging/rebasing feature that was abandoned but is being revived

Say we have this situation: * master | * a | * b ... a lot has happened * ... a lot has happened * z | | * aa (want to rebase onto master or merge into master but having too many ...
4
votes
3answers
277 views

Is it good to split big repository into smaller ones to have separate history/issue etc or keep it big?

We are currently porting our huge svn repo to git and we are thinking to export subdirectories of repository, each one containing source code of independent binaries, documentation or robot tests, ...
2
votes
2answers
75 views

Is a guardfile part of the private developers environment or the public OSS project?

Let us say I have an open source project on github. Now I wish to include tools required to develop the project so others can easily contribute. It is hard for me to tell when these tools should be ...
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, ...
0
votes
1answer
119 views

Repository strategy for multiple interconnected components with small differences

At my work we have multiple products.. productA, productB, ... these products reference multiple components. componentA, componentB.. there are also shared components sharedA, sharedB... etc.. which ...
0
votes
1answer
223 views

What's the benefit of GIT for solo programmer? [duplicate]

If I am working on a program alone, I just zip entire program folder once in a while. I keep only latest 2-3 files so my disk isn't cluttered. So for example I would have 2 files: ...
1
vote
1answer
111 views

How to organize remote Git branches when team does single change releases?

I am a member of a project team with somewhat unusual (or at least from my perspective) release methodology and team dynamic. The way we have been doing releases is rolling out a single functional ...
7
votes
3answers
174 views

Git, semantic versioning and how it fits into (my) a typical development timeline?

I'm working on a Q&A system and about to tag my current application with "1.0.0" for it's first official version/tag. It's about to be rolled out for beta testing to a limited test audience next. ...