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

learn more… | top users | synonyms

0
votes
1answer
38 views

Upgrading inherited 3rd party code with changes

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 ...
1
vote
1answer
78 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 ...
4
votes
1answer
111 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 ...
8
votes
4answers
7k 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
63 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 ...
0
votes
1answer
67 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
47 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
122 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 ...
0
votes
0answers
37 views

Version Control on on local test environment automatically modify some files [migrated]

For my local test environment that I use there's a few files that need to be slightly modified from version control in order for the web application to work. Really it's just a few lines of code a ...
2
votes
2answers
114 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
42 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 ...
1
vote
0answers
79 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
3k 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
47 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 ...
0
votes
1answer
83 views

Git: Keeping track of work in progress

I'm looking for tools and/or practices and/or advice for keeping track of work in development. In an ideal world, you have a well-defined task, a bug tracker with a ticket to track your progress on ...
2
votes
2answers
67 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
31 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 ...
3
votes
3answers
193 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
68 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
64 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
167 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
57 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 ...
5
votes
3answers
104 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
108 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 ...
72
votes
3answers
27k views

Choosing between Single or multiple projects in a git repository?

In a git environment, where we have modularized most projects, we're facing the one project per repository or multiple projects per repository design issue. Let's consider a modularized project: ...
29
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 ...
8
votes
5answers
2k 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 ...
58
votes
11answers
10k 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 ...
4
votes
2answers
256 views

Why does Git have tags?

I've read Git branching and tagging best practices and git tagging comments - best practices, but I don't see a direct answer to something I've wondered for a long time: Why does Git have tags? ...
27
votes
8answers
24k 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 ...
9
votes
2answers
2k 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 ...
12
votes
5answers
4k views

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

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
129 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 ...
2
votes
1answer
127 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 ...
3
votes
1answer
167 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
139 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
168 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
416 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
36 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
58 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
124 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
130 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 ...
2
votes
1answer
206 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
104 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
9answers
3k 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
96 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
108 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 ...
2
votes
3answers
345 views

How Best Can I Use Git When My Employer Uses VSS?

I am going to be working with VSS but I am much more productive and diligent with GIT. I have to fit within the workflow of VSS and keep good history in VSS. The standard work flow here with VSS is ...