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

learn more… | top users | synonyms

3
votes
2answers
104 views

Squashing commits from multiple developers into a single commit

I work in a large software development group and we've recently made the switch from Clearcase to Git. Some predictions have been made with regard to the quality of the mainline in that it would ...
12
votes
3answers
3k views

Git Project Dependencies on GitHub

I've written a PHP framework and a CMS on top of the framework. The CMS is dependent on the framework, but the framework exists as a self-contained folder within the CMS files. I'd like to maintain ...
22
votes
7answers
2k views

Automatically reverting commits that fail the build

A colleague of mine told me that he is thinking in making our CI server to revert commits that failed the build, so the HEAD in master is always stable (as in passing the build at least). Is this a ...
25
votes
6answers
2k views

Which DVCS (git or hg) is easier for programming students? [closed]

A bit of context: I'm in 3rd year of college. students are divided into teams of 4. Almost everyone will be working under windows (except a few like me who are on linux). As part of the school ...
4
votes
1answer
112 views

What would happen if two different commits in one git repo had the same hash?

I know this has been said to be pretty much statistically impossible but that's a different question. What would be the consequences if against all odds, this did occur?
1
vote
0answers
41 views

One or multiple visual studio solutions for all my projects [duplicate]

Admittedly that's a bad title, but the full title would be far too long. To give some context. I volunteer at a charity where I maintain a MSSQL Database and an MS Access client application and I'm ...
3
votes
1answer
43 views

Merging from unfinished feature branches and code review

We are using the git flow workflow, and it sometimes happens that we have long-lived feature branches. Of course we can merge from the develop branch into our feature branch, when another feature ...
25
votes
2answers
2k views

Are Git branches, in fact, “homeomorphic endofunctors mapping submanifolds of a Hilbert space”?

As we all know: Git gets easier once you understand branches are homeomorphic endofunctors mapping submanifolds of a Hilbert space Which seems like jargon, but on the other hand, All told, ...
42
votes
11answers
12k 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/, ...
2
votes
0answers
191 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 ...
0
votes
0answers
6 views

What is the point of using git alias? [migrated]

Consider the following: $ git config --global alias.show-graph 'log --graph --abbrev-commit --pretty=oneline' Now, typing git show-graph executes the log command shown above. Question: Why not ...
1
vote
1answer
42 views

How to decide git repo division with workflow considerations?

We are moving from subversion to git for branching and distributed development reasons. One struggle in the past with our old repository workflow was that every application had its own repository. A ...
-1
votes
1answer
95 views

How do front-end developers test pages when the files they are handed are PHP views? [closed]

Someone who has a PHP project invited me to do the front-end work on his site. I don't know PHP, I've only ever worked with HTML/CSS/JS files. I cloned the project files from GitHub, and all of the ...
95
votes
5answers
35k 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: ...
0
votes
1answer
67 views

Will changing published git history on a private repo cause problems when I make it public?

I have a github repo that is currently set to private. I'd like to make it public but before doing so would like to clean it up a little bit by squashing some commits and possibly rebasing so that the ...
2
votes
2answers
109 views

“Party on my branch” workflow support in mercurial

When I'm on a git project, I have a workflow that goes something like this: Start a new feature (open a new branch) Write some code, commit some code, repeat Push the code to a remote, possibly with ...
0
votes
1answer
35 views

What's the proper way to organize and revision a pull request

I'm working on an open source project for the first time and I'm adding a feature to the source. The way I've been going about, is I've squashed my individual commits into on clean commit for the ...
1
vote
1answer
78 views

Git Question: What to do when multiple people working on a project?

I made a project and put it on github, it's basically a small powershell function that is pretty useful in some situations. I've since made some improvements to it to add functionality...but someone ...
1
vote
1answer
69 views

How to handle a project in git with the same code but different templates?

I have a project where the only difference are the templates. The question is how should I manage this with git now? At the moment I have 3 different git Repos, but it's hard to maintain all 3 of ...
5
votes
1answer
65 views

Introducing Pull Requests for a 2 person team - merge my own requests?

I'm introducing git to a junior team member (a co-op). They are comfortable now with the basics of adding, committing, pushing and pulling. Now I want to introduce them to pull requests and ...
1
vote
2answers
54 views

Using sourcetree/bitbucket how can I manage multiple projects using a common codebase?

I have made a few libraries that different projects use. When I make changes to projects, I sometimes make changes to the codebase, and I want to be able to manage this all through sourcetree. So, ...
5
votes
2answers
363 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? ...
1
vote
1answer
60 views

Development Workflow (Git/CI) in varied tech level .NET Shop

tl;dr: I need a development workflow for ASP.NET apps that works for the designer on a Mac, the content writers who don't have visual studio, and the C#/.NET developers (mostly me), such that we can ...
7
votes
4answers
816 views

Developers blocked by waiting on code to merge from another branch using GitFlow

Our team just made the switch from FogBugz & Kiln/Mercurial to Jira & Stash/Git. We are using the Git Flow model for branching, adding subtask branches off of feature branches (relating to ...
1
vote
1answer
66 views

Avoid branch conflicts/race conditions with task branches

Background Support and Sprint are the test branches for bugs and tasks Each bug gets a new branch from master, which is merged into Support, when tested good, a pull request is made between the ...
0
votes
1answer
52 views

Average commits per merge to Master using gitflow [closed]

I'm currently working alone on a project, but I still use Git since it is a really powerful tool. I use gitflow workflow methodology, and today I have merged to master with 77 commits. I was surprised ...
4
votes
3answers
105 views

How to maintain an unpopulated 'config' source file in git repo?

Suppose I create some widget, and decide to share it with Github. In this widget project, there's some configuration/preferences file. I need to share what the values being set are, so that if anyone ...
2
votes
2answers
97 views

Should unit tests run on every git branch?

I am new to repo management / continuous integration. I designed a repo in the following way PROJ |-src |-include |-lib |-config PROJ_Unit_Tests |-src |-config PROJ_Doc When I now do ...
2
votes
0answers
41 views

tracking branch relations with Git [closed]

here is my workflow. I have master as the most complete version of the program. If I want to add a feature I'll create a branch named with -feat as a suffix. as bugs come up, I'll create new branches ...
12
votes
6answers
838 views

Is it fine to have broken intermediate commits, as long as the final commit in any push works?

Related: Should every git commit leave the project in a working state? Suppose I make the following commits locally: Modify the database schema, breaking the application. Update the application so ...
4
votes
2answers
3k views

Summarize changes (insertions and deletions) in Git [closed]

I want to look at how my code base has grown over time. GitHub has a nice +/- display along the list of checkins which gives a sense of this. Is there something similar I can use with my Google Code ...
2
votes
2answers
113 views

Git Repository Setup

I am moving my companys source control from TFS to GIT. We have TFS currently defined as. Project Collection / / Client A / Product A / Product B / Product C / Client B / Product D / Product E / ...
4
votes
1answer
48 views

Does Changing Author info in git repo affect other contributors?

After contributing some weeks I noticed that the author name in my commits were incorrect. Does changing the git history with author info in the commits create any problems for my fellow contributors? ...
27
votes
3answers
2k views

Version control practice for Rewrites

We developed a product (prototype) P_OLD in language X and we are now rewriting it from scratch as P_NEW in language Y. Since P_NEW and P_OLD are the same product: Should P_NEW just be a brach of ...
98
votes
10answers
13k views

My coworker commits and pushes without testing

When my coworker thinks that there is no need for a test on his PC, he makes changes, commits and then pushes. Then he tests on the production server and realizes that he made a mistake. It happens ...
4
votes
1answer
201 views

How can I split a repository that contains many projects which share the same build system?

I've been working on the past years on a research compiler suite, which builds several executables and libraries. It has a build system (namely bootstrapper) that looks into the ./src/bin directory ...
2
votes
0answers
48 views

Proper GIT repository usage that accommodates feature branches and parallel testing

After reading around I found that there were various git workflows being used but there aren't enough (or I just haven't found them yet) info on how to use git properly with having test builds. I was ...
2
votes
1answer
144 views

Git branch model critique: always derive from master

I am currently working on a large project involving at least 3 teams working on separate feature sets in the same codebase versioned on Git. Some features require back-end integration and ...
0
votes
1answer
68 views

Using open source apps source code under Apache v2 [closed]

I modified some code and added few (minor) changes to an open source Android app. Now I want to publish it on play store. The app is licensed under Apache license v2. The license file is included in ...
0
votes
1answer
45 views

git workflow: read access + pull request or write access? [closed]

Suppose there is a small team with 1 senior developer and 3 junior developers working on the same repo in a team on a github organization. The senior developer has admin access. What is the most ...
12
votes
2answers
426 views

Is the git “Golden Rule of Rebasing” so essential?

I had a discussion recently with people absolutely opposed to a rebase strategy of feature branches on GIT. It seems to be an accepted pattern to use rebase only for local, private branches but never ...
0
votes
0answers
38 views

GIT repository layout for a Solution with multiple projects [duplicate]

I was a TFS User where we had a single Solution with multiple Projects and one developer can check out his project when they need. Also the Build system can do separate build for each Project or ...
9
votes
6answers
340 views

In git, how to do versioning for a dozen libraries all worked at in parallel

We are doing projects, but we reuse a lot of code between the projects and have lots of libraries that contain our common code. As we implement new projects we find more ways to factor out common code ...
1
vote
0answers
42 views

What git process when it says “removing duplicate objects” on merging branches?

Git displayed "removing duplicate objects" after I merged a branch to another and noticed my .git/objects folder has significantly reduced (from 40.7 MB to 33.5 MB). Isn't branch just supposed to be ...
7
votes
1answer
195 views

Handling Code Signing in a Source Controlled Environment

Just a quick question, hopefully: My team maintains a piece of software that uses ClickOnce deployment and is signed with a certificate. We keep the public certificate that is actually used on a ...
3
votes
2answers
160 views

Migrating from SourceForge to Github, should I delete the SF repository entirely?

It's long overdue, but after a few too many horror stories I'm finally moving a long-running project of mine from SourceForge to GitHub. Simple question: Should I delete my SourceForge project ...
2
votes
2answers
46 views

How to handle pull requests to original repo with changes dependent on a newer version of the compiler

I have a github project that I've forked. The original repo was written for a version of OCaml before version 4.02.1. The 4.02.1 compiler gives me various deprecation warnings which I plan on fixing ...
1
vote
2answers
143 views

Git clone to memory

I'm making an app that is required to clone git repositories by a link to it and analyze the codebase. Pulling to the disk using the git clone command wouldn't scale well. Is there any way to clone ...
6
votes
2answers
209 views

Accidentally including unrelated changes in commits

My personal approach to a git commit is that every commit should include a unit of change, in its completness. When I develop, I usually focus on such units. But sometimes, my attention strays ...
3
votes
2answers
161 views

Can I use git to replay changes for projects that use media assets rather than program source code?

So while waiting for a project to build I like to run gource and see a fun video of my team building the project over time. While I was watching me and my team fly around editing and changing the file ...