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

learn more… | top users | synonyms

0
votes
0answers
48 views

What is the best way to handle two very similar projects with Git? [duplicate]

I am very new to Git (as in started last week to use it properly) and I have 2 projects. Project X and Project Y which is a fork of Project X with a lot of very slight modifications. What is the ...
2
votes
2answers
83 views

Create separate GIT repository for publishing with different history?

I'm developing a project, which I'm pushing to private repository on my VPS. However, I'd like to publish it on GitHub. I make a lot of commits(mostly as backups) which doesn't contain complete ...
12
votes
3answers
411 views

How can we keep track of which version of our code is in each environment?

My team currently uses a fairly simple branching/deployment process that looks like this: ┌────────┐ ┌────┐ ┌──────┐ Environments: │ DEV │ │ QA │ │ PROD │ ...
38
votes
9answers
21k views

Should Git be used for documentation and project management? Should the code be in a separate repository?

I'm starting up a Git repository for a group project. Does it make sense to store documents in the same Git repository as code - it seems like this conflicts with the nature of the git revision flow. ...
2
votes
2answers
137 views

Should we include Nuget PACKAGE folder in version control?

I would like to know In C# or VB.NET project should we include the PACKAGE folder (nugget package folder that is created to the root of my project that contain the nupkg files and other content) to ...
16
votes
4answers
1k views

Why is the Git .git/objects/ folder subdivided in many SHA-prefix folders?

Git internally stores objects (Blobs, trees) in the .git/objects/ folder. Each object can be referenced by a SHA1 hash that is computed from the contents of the object. However, Objects are not ...
1
vote
0answers
104 views

Git Repositories updated

I would like to keep two Git repositories updated. First one, is GitHub open source project that gets updated frequently. Second one is a private held Git Repo located other than GitHub. This one ...
2
votes
0answers
76 views

Justification for different code bases on different branches in the same repo? [closed]

Branches in git repos or similar are practically always derived from the same code base; after all, they're usually merged back in to master later. But, if you wanted your open source project on ...
54
votes
4answers
5k 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 ...
0
votes
0answers
17 views

How to organize enterprise software in Git [duplicate]

I'm running into a conceptual design dilemma with our enterprise software. I'm hoping someone on here can help point me in the right direction. We have many different applications: Three Windows ...
3
votes
1answer
185 views

What does k stand for in gitk? [closed]

I wonder k must mean something in gitk. Could not find it on Google. Found that git was named by Linus Torvalds out of imagination. But when a tool was added with name gitk, there must be something ...
2
votes
2answers
181 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 ...
-2
votes
2answers
113 views

When to really use a branch in git? [closed]

I have automated a few test cases and pushed them for review. However I need to continue developing other testcases in the same code. I cannot create a new sandbox everytime as my changes are not ...
27
votes
7answers
3k views

How to choose between git and Mercurial [closed]

Both Git and Mercurial are DVCS, and that's great. I wonder if there is a list of particular situations when one of those systems are preferable, something like 'In mobile development for many ...
0
votes
0answers
63 views

When should I start creating branches? [duplicate]

I am the only developer building a library. I have implemented many of the basic components, but the library itself is still useless until several other components have been built. So far, I have ...
3
votes
0answers
360 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 ...
5
votes
3answers
2k views

How can I get an anonymous user to submit bugs on a private GitHub project?

Our company has a private GitHub repository for the project I'm working on. After a full summer of work, it looks like we'll be launching this week (wheee!). However, I want to include a "submit a ...
1
vote
1answer
143 views

Why use `stash@{n}`?

git stash apply stash@{n} contains a number of hard to type characters and repeats some information. Is there a reason for repeating the stash and using the at-sign and braces instead of something ...
0
votes
1answer
85 views

Development environment for lots of websites with Git

I have 5 different websites that use exactly the same code, apart from they have an uploads folder with different contents (AKA images that aren't consistent through every site) and also a config file ...
4
votes
1answer
87 views

Code licensing injection and version control history

Are there licensing ramifications to having GPLed code in a public git history, but not a released version of the distributed software? Could a repo owner be obliged to changing their licensing ...
1
vote
3answers
142 views

Git repo with lots of medium-sized images?

I've just used git-tfs to checkout a TFS repo into a Git repo. The .git directory comes to 2.33GiB, and the primary reason for this is a couple of large directories coming to about 650MiB each. Each ...
15
votes
3answers
583 views

What to do about large svn history when moving to git?

Edit: unlike some similar questions such as Moving a multi-GB SVN repo to Git or http://stackoverflow.com/questions/540535/managing-large-binary-files-with-git My scenario doesn't involve several ...
43
votes
3answers
4k views

What happens if a feature merged into develop is postponed by management?

We recently had a problem whereby a feature for our webapp (automatic signup) was postponed by management because they felt the start was too "cold" but they wanted all the other features we had been ...
4
votes
2answers
154 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 ...
13
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 ...
23
votes
7answers
3k 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
163 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
43 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
81 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 ...
35
votes
2answers
4k 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, ...
47
votes
11answers
13k 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
57 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
129 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 ...
114
votes
5answers
45k 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
76 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 ...
1
vote
1answer
47 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
91 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
103 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 ...
6
votes
1answer
132 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
125 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, ...
6
votes
2answers
424 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
93 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 ...
9
votes
4answers
1k 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 ...
2
votes
1answer
100 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 ...
1
vote
1answer
62 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
119 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
165 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
48 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 ...
13
votes
6answers
959 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 ...