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

learn more… | top users | synonyms

6
votes
1answer
100 views

Why use a dedicated “pushbot” user which automatically merges approved pull requests?

Most Github repositories I'm aware of use the following workflow for pull requests: one or several users with "contributor" privilege review the suggested changes and then one of them merges the pull ...
0
votes
1answer
67 views

Managing a project on github in different repos or one? [duplicate]

An app I am working on (iOS) is being distributed to different businesses and each business needs a few customizations to said app before it is distributed to users on the app store. Most files will ...
12
votes
3answers
2k views

Branching breaks continous integration?

I think this article, A Successful Git Branching Model, is very well known among experienced DVCS users. I use hg mostly, but I would argue this discussion is fine for any DVCS. Our current ...
0
votes
1answer
133 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 ...
1
vote
0answers
66 views

Multiple git committers on same repo and machine with forwarding agent

I have a remote machine where multiple developers work on the same repository. We use gitolite and SSH keys to manage git access. As for now we code on the local machines, commit, push, pull remotely ...
10
votes
2answers
13k views

Best way to structure a Git repository for Maven

I need some advice on how to structure our projects in Git. We use Java and Maven is our build tool. Maven kinda assumes all of your projects have a common ancestor eventually. Maven can also be a ...
6
votes
4answers
216 views

Is there any downside to commit messages containing the ticket number

I was wondering if it would be good practice for commit messages to contain the ticket number they were apart of. It would be like 2568 Fix heating issue Summary of the issue with a bunch ...
1
vote
1answer
112 views

Development workflow for a team: local to live (with GIT)

We're trying to put together a workflow for Wordpress development which turns out to be pretty complicated with lots of elements. Is there a way to streamline this or filling in the gaps? We ...
2
votes
0answers
78 views

Combining GitHub and TFS / Visual Studio Team Services

I wonder if it's possible to combine Visual Studio Team Services and/or TFS with a GitHub repository. We think both products have their own advantages and would like to work on one repo within our ...
1
vote
1answer
113 views

More than one deployable git branch

My dilemma is about the GIT flow. Let's assume that I have an application that can be deployed differently (staging release, QA release, production release). Since the application has profiles to be ...
0
votes
1answer
174 views

Git Bisect found the buggy commit. Now what?

I've seen blog posts explaining how to do Git bisect, but how to you fix the bug, commit again and maintain the rest of the commit history? An actual problem I faced in my project was like this (the ...
3
votes
1answer
56 views

Isn't the master branch just a surrogate of tagging in the gitflow model?

Reading the gitflow model, it seems to me that the master branch is there only to provide a branch where to store stable versions. What does that add to just tagging develop with the stable versions?
4
votes
1answer
71 views

Do feature fixes need to be local only?

From this blog post describing the git-flow model, it seems that feature branches have to remain local to the user working on them and are actually deleted right before pushing to origin. This kind ...
1
vote
0answers
47 views

Where do bugfixes go in the git-flow model?

In the, commonly referred to as, Git-flow model hotfixes go in their specific hotfix-* branch and small integration fixes right before release go in the release-* branch. General bugfixes from the ...
8
votes
3answers
192 views

Git branching strategy for long-running unreleased code

At our team, in addition to individual units of work (Stories), we have longer-running themes of work (Epics). Multiple stories make an epic. Traditionally we've had feature branches for each Story, ...
56
votes
4answers
4k views

Why does git pull perform a merge instead of a rebase by default?

Consider the following situation: You have a clone of a git repository You have some local commits (commits that have not yet been pushed anywhere) The remote repository has new commits that you ...
3
votes
0answers
109 views

Documentation of code review

In a project we have a rather formal code review, which is currently done manually and documented in Excel sheets and Word docs. We would like to improve the current code review process by ...
4
votes
0answers
121 views

Is there a simpler way to help testers push code to a testing branch?

I'm a amateur programmer, I'm not used to working with Git. It's my job to help test new code, for a while now this has included pulling the branch containing the issue, merging it with the main ...
0
votes
1answer
108 views

An elegant way to store build counter [closed]

We use Git and Jenkins as our build&release system and each build is assigned a version number which looks like this: 6.0.12345. Here, the 12345 part is a counter which increments with each build. ...
6
votes
1answer
77 views

Optimizing a file type for compare tools

Context: I am developing a visual studio plugin that generates layer diagrams. I want the tool to be able to produce an intermediate output, which is the data representation of what is being rendered ...
1
vote
2answers
104 views

Should I use a single repo when multiple parts of the same project are running on the same server? [duplicate]

I'm planning a project that consists of the following parts: REST API in Lumen Web client in Laravel Product website in Jekyll These separate products are going to be running on the same server. ...
5
votes
4answers
218 views

How to determine when to open a new branch or a new repository when using Git?

Currently I am working on a project to make a product for company X. The team I am working with is selling similar service to many company with similar product, where 40% of the code is reused and 60% ...
6
votes
3answers
113 views

Do we need to create local branches for the enhancements we are working on?

We just started implementing the Git source control for our project and the Admin says we should not be creating any new branches for the enhancements that we are working on instead everybody should ...
3
votes
2answers
98 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 ...
6
votes
1answer
127 views

Merge bug fixes from trunk in old branches

We are now in the process of switching from svn to git (after a year spent on convincing people, yay!) in my company. So far, this is all for the better but there is one little thing that we ...
33
votes
4answers
7k views

Organizing Git repositories with common nested sub-modules

I'm a big fan of Git sub-modules. I like to be able to track a dependency along with its version, so that you can roll-back to a previous version of your project and have the corresponding version of ...
118
votes
9answers
10k views

Maintain hundreds of customized branches over master branch

Currently we have one master branch for our PHP application in a shared repository. We have more than 500 clients who are subscribers of our software, most of whom have some customization for ...
0
votes
2answers
79 views

Is it better to start a Pull Request or perform a local merge commit on master?

I have been using GitHub for quite some time now and I usually used to push my feature-branches and then start a Pull Request which I myself merged. I found it helped me keep track of where I merged ...
0
votes
2answers
207 views

If you decide that branching is a bad thing, then why use Git over SVN? [closed]

I have used Git and Mercurial a bit over the past ten years and appreciate and prefer them, but most of my experience is with SVN. If it is decided within a corporate programming group that branching ...
0
votes
0answers
47 views

Workflow for maintaining a partially diverged fork

I work on a code base where I maintain a fork that is diverged from the upstream slightly. The project is about 5 million lines, and in general the developers and the users of a the code are the same ...
4
votes
0answers
393 views

Keeping a permanent git fork updated [closed]

Please consider the following scenario: There is an npm package named some-package. There are a couple dozen known dependent npm packages that all depend on some-package. I forked some-package and ...
7
votes
2answers
504 views

Should collaborators on a private Github repository each fork the repo?

I'm working on a project at the moment, and we have the source code up in a private repository on Github, with each of us as a collaborator. What we are unclear on is how to separate each of our ...
1
vote
2answers
111 views

How to make git automatically merge increased build numbers? [closed]

I like having build numbers, just because it is cool. Please don't judge me :D. However, I develop on two machines (one OS X and one Windows for portability checks). I have on both machines a script ...
12
votes
2answers
261 views

Workflow, editing things not in your current task

Usually when I program, I have a clear task ahead of me, but find annoying things I'd like to clean up as I go on. Here I see three options: Do it later (may forgot/have to spend time adding a ...
6
votes
1answer
226 views

Git branching from a feature branch to work on a subfeature

We're currently in the following situation, where a feature branch has been branched for a sub-feature branch (like, working on backend and frontend things for the same feature): o | o development ...
2
votes
2answers
469 views

Making major version step in software development in separate repository [duplicate]

Currently we are planning to switch from our software version 5.x.x to 6.x.x. Such major releases contains in our case a lot of refactoring work and changing the software architecture. Instead of ...
1
vote
1answer
670 views

How to find method and class usages along git repositories

We got some code in a git repository that's used along different projects (with git different repositories), the problem is that we got now so many different projects that's difficult to track which ...
23
votes
6answers
836 views

How do I approach a complicated merge

Here is the deal, I have joined a new company and have been asked to finish off the work on a branch which hasn't been touched for almost a year. In the meanwhile, the master branch has been growing ...
2
votes
2answers
366 views

Forking an open source project using Git

There is an open source project that I want to fork for my own reasons. It currently has a Git mirror of its main SVN repository which I can use. What are the best techniques for forking a project ...
5
votes
0answers
62 views

Restructuring SVN repo for migrating to git [duplicate]

We currently have a SVN repo structured like so /trunk/library/libA /libB /libC . . /trunk/tools/toolA /toolB . ...
13
votes
2answers
285 views

How to handle it when a commit in-progress suddenly appears to depend on another that isn't there yet?

I'm inexperienced with Git but I try my best to get used to it, and so far I'm just using it for projects I work on alone. When I code there's some top-down approach naturally (as I can't know the ...
2
votes
2answers
86 views

Bugs showing up with merge on the release branch

When trying to follow the the gitflow model, we have a branch for the releases. However, we've had complicated merges when trying to merge from develop and bugs have crept in to that branch from ...
0
votes
0answers
54 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
90 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
462 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 │ ...
43
votes
9answers
23k 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. ...
3
votes
2answers
281 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 ...
17
votes
4answers
2k 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
105 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
83 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 ...