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

learn more… | top users | synonyms

39
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 ...
5
votes
4answers
785 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
130 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
691 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
53 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
233 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 ...
8
votes
1answer
1k 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
164 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
55 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
140 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
10k 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
103 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
87 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
68 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
288 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 ...
3
votes
2answers
301 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
89 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 ...
11
votes
6answers
6k 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 ...
3
votes
2answers
135 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
56 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 ...
6
votes
3answers
384 views

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

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, ...
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
231 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 ...
1
vote
1answer
272 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
175 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
330 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. ...
3
votes
1answer
270 views

Should I rename package after Android app name change?

I have an Android app. I have changed the app's name from appname1 to appname2. I would like to know if I should also change my package name from com.myname.appname1 to com.myname.appname2 to reflect ...
35
votes
4answers
2k views

Should a github maintainer rewrite author's in pull requests?

I'm not a programmer by profession, but I do some coding and have used github some. I've run across what I find to be a surprising situation. I'm very familiar with git. There is a project which I ...
10
votes
5answers
4k views

To integrate git versions as build numbers or not?

A colleague and I have been taking turns debating/discussing the issues/merits of integrating a version derived from the current git repository into our code whenever it builds. We think the merits ...
64
votes
11answers
17k views

Why learn git when there are GUI apps for GitHub?

Given that GitHub provides GUI apps for both Mac and Windows, what are the benefits of learning to use git from the command line? Currently I'm using their mac app to update my repositories, and so ...
41
votes
8answers
54k 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 ...
12
votes
2answers
3k views

Managing multiple versions of a web application using Git

We have a family of apps, all having the same base. Until now I've been developing this base, and the Git workflow was very simple: Development is done in develop branch New features are developed ...
14
votes
5answers
9k views

Is it reasonable to use git only on my local machine? [closed]

Is it ok to just use git only locally? I don't want to have to pay for a service that provides private repositories (such as Github) but I think git is a great way to organize my closed-source ...
2
votes
1answer
874 views

Git workflow for Microsoft SQL Stack

My team of developers are currently working at a client who has required us to move away from SVN and begin using their native workflow program. (Source tree by Atlassian). We are data warehouse ...
5
votes
1answer
2k views

Appropriate Git workflow for multiple active releases while handling hotfixes

I'm trying to choose a Git workflow that is most appropriate for our product. Here are the parameters: We do a few major releases a year, let's say 10 at the most We have multiple versions of our ...
4
votes
1answer
229 views

Database Password problem when using GIT to manage project that uses Spring to initiate Datasource

I use Spring Framework to code my Web Service, using Dependency injection to inject a DataSource bean into the DAO bean that will be used by the Web Service. I have all the database properties(Url, ...
0
votes
3answers
308 views

Does frequent committing prevent merge conflicts?

Is there any situation, where git merge command uses frequent committing in one or both branches to prevent merge conflict (as opossed to one giant commit of week-long work followed by immidiate ...
2
votes
1answer
481 views

Shared code across many (web) projects using git

I work in a small team that creates and maintains quite a lot (> 100) of ASP.NET website projects. Our current workflow is that our projects are all located on a network drive, which everyone works ...
1
vote
3answers
768 views

Why is having merge bubbles in your git history not actually that bad?

In the past year, most of the rest of my group (of engineers that I work with), has ended up deciding that merge bubbles really aren't that bad. At the very least, I'm seeing that other developers ...
0
votes
1answer
90 views

Advice on structuring a Git repo into branches for an iterative tutorial [duplicate]

I'm a teacher and I'm about to publish a tutorial on how a build a PHP app in several iterative steps. At each iteration, I want to provide access to the associated source code and differences with ...
1
vote
1answer
81 views

How to avoid old commits/PRs that are painful to merge?

We have a pretty good code review process, but there are couple of issues. The most annoying problem is merging. From time to time the number of stuff to merge grows rapidly and some of the commits ...
4
votes
0answers
187 views

Putting together a business case for moving to git from TFS? [closed]

I'm probably going to be giving a presentation to my company (mainly management, but also senior developers) on the benefits of moving to Git from a centralized TFS setup. I know that I massively ...
0
votes
3answers
167 views

Is seeing loads of merge messages in a git branch standard, or are we working incorrectly?

We're in the process of switching from SVN to git, and I've noticed that we're seeing a lot of these commit messages in git: Merge branch 'development' of [Url to Origin]. These are coming in where ...
3
votes
1answer
661 views

Why aren't there cherry-pick requests?

One disadvantage to pull requests is lots and lots of merge commits. It's not the worst thing, but it does clutter the commit logs, and make for lots of unnecessary non-sequential history. A - C - E ...
8
votes
3answers
2k 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
3answers
109 views

Something like “tracking” for local branches in git?

I often have a workflow where I develop some feature in a Git branch, switch to another feature-branch, etc. During development, the original develop branch and the feature branches diverge. Now when ...
12
votes
7answers
4k views

From TFS to Git

I'm a .NET developer and I've used TFS (team foundation server) as my source control software many times. Good features of TFS are: Good integration with Visual Studio (so I do almost everything ...
3
votes
1answer
205 views

Why does Git's stash commit need two parents?

Why does Git's stash commit need two parents? In the Hacker's Guide to Git, I see this mental model for stashes: The guide tells me that stash@{0} needs both A and B as parents. Why? Why doesn't ...
0
votes
1answer
167 views

Developer Branch vs. Feature Branch [duplicate]

I saw around that development teams usually use source control in one of 2 schemes: Either "Feature Branch", where each feature is developed in a new branch, or "Developer Branch", where each ...