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

learn more… | top users | synonyms

3
votes
2answers
110 views

What is the utility of the predictable SHA's in git?

I am learning git. I am wondering why the git spec is explicit about how the commit SHA's are calculated? It is my understanding that the delta blob (the unit-of-work) is calculated into this SHA as ...
1
vote
2answers
114 views

Git push to deploy technique [duplicate]

I'm adopting a git push to deploy method where I setup a bare repository on the live server which I push my local changes to. Using a post-update hook, executed after I've pushed I pull my changes to ...
2
votes
1answer
93 views

Can tags be used as bookmarks under semantic versioning?

Shameless plug: this question is for StackMode – a StackExchange client for GNU Emacs 24+. The product I'm working on, version-controlled with git, is a desktop application with an innately exposed ...
0
votes
3answers
108 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 ...
2
votes
3answers
482 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 ...
2
votes
1answer
80 views

Use git to manage different deployments of the same repo

I have a web application built in PHP. I want to use Git to manage the different aspects of the deployment. Now some of the files in the web app are specific to a client (logos, database connection ...
2
votes
1answer
107 views

Managing shared code in source control

Projects A and B both use library project L: Judging by what people have written about it on the web, managing this situation appears to be a headache: ...
0
votes
1answer
173 views

How often to open pull requests [closed]

We are planning to use Git pull requests for code review in our company. Before we start I have a basic question: How often should I open a pull request? Is it best to open one for every little commit ...
3
votes
3answers
384 views

Grouping multiple git repositories that are part of the same overall project

Let's say I have a project that has multiple components: a server component, a webapp component, an iOS component, Android component, etc. These components are all separate codebases, but are also ...
1
vote
3answers
532 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 ...
20
votes
3answers
2k views

On GitHub, etiquette and pull requests [duplicate]

If someone forks your repository and commits some changes, what is the accepted way to proceed if you'd like to ask them whether it's alright to pull those changes in? Can you issue a pull request on ...
0
votes
1answer
101 views

snapshot in git or version control system (vcs) [closed]

I recently started learning/working git. I've gone through some materials but still didn't understand what actually is a snapshot.
2
votes
2answers
75 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 ...
0
votes
0answers
37 views

Git Workflow for multiple sites sharing common functionality [duplicate]

Apologies if you've heard this question or variants of it multiple times before. However, I have the following situation: We develop a site using Drupal/Wordpress - let's call it Site Foo_A. We're ...
0
votes
5answers
142 views

Should private key files be checked-in in git?

In my understanding, git as version control system should track all resources or files that are necessary to build a software version. If a private key file is needed for a server to function ...
0
votes
0answers
27 views

Should I keep JBoss under version control? [duplicate]

Should I keep my JBoss installation under version control so other team members can pull it? Is that common? Configuration changes, module installations etc would be version controlled. I have a ...
3
votes
3answers
258 views

How do you identify bugfix commits on QA environment with Git repository?

I got used to the following approach on bugfixing phase of the project development. The developer should add SVN commit number as a comment to the JIRA issue when resolving it. Latest artifact from ...
1
vote
0answers
24 views

version control (mercurial) access by subproject

I have a central codebase, from which I branch subprojects for each client. Right now I have the central codebase in mercurial repo A and client specific code in mercurial repo B, C, D... etc. I would ...
2
votes
2answers
178 views

Best Git workflow suitable for our needs

I need help with the workflow that is best suitable for our needs. We are a 3-4 person team and are working on 4 different projects. We have three main branches: master - deployable production ...
2
votes
1answer
332 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 ...
1
vote
1answer
246 views

How to enable non technical users to use GitHub

We're currently storing two Dynamic CRM solutions in Github and have triggers to automatically deploy these solutions once a change has been pushed to the master branch. This works really well in ...
23
votes
1answer
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, ...
1
vote
2answers
266 views

Organizing code in a 2 man team

I've been working with a buddy of mine on a school project. We forecast it'll take ~2 months, so it isn't a small scale project at all. Communication and splitting the work effectively has been a ...
1
vote
0answers
115 views

Git collaboration with pull request in a company

I am thinking of a way to do collaboration between coders in a company, suppose we have 2 type of servers: Production and Staging. Now we want to review all changes going to Production via ...
10
votes
4answers
3k views

How to use github, branches and automatic releases for version management? [closed]

I understand most of the basic Git/Github concepts by now, however I still have trouble understanding the bigger picture. These are some things that I have managed to get working so far: Push ...
0
votes
1answer
509 views

Git structure for java project

I know there are multiple posts on similar problems, so please be kind with me. I am asking for suggestions I have not thought of and for good advice. I have a java "project" that is structured in a ...
16
votes
4answers
1k views

Is using Git Stash as a workflow an antipattern?

I've recently been looking at how me and my team uses Git and how our workflows work. We currently use a feature-branch workflow which seems to work well. I've also seen some individuals on our team ...
2
votes
2answers
73 views

git workflow for separating commits

Best practices with git (or any VCS for that matter) is supposed to be to have each commit do the smallest change possible. But, that doesn't match how I work at all. For example I recently I needed ...
3
votes
1answer
98 views

How to cleanly add after-the-fact commits from the same feature into git tree

I am one of two developers on a system. I make most of the commits at this time period. My current git workflow is as such: there is master branch only (no develop/release) I make a new branch ...
0
votes
0answers
86 views

What is the problem git submodules are supposed to solve?

What is the problem that git submodules solve well? When should I use them? Or rather what is their use case? The only use of submodules that I have seen 'in the wild' has been when used to share ...
4
votes
1answer
303 views

Tracking contributions from contributors not using git

I have a central git repo located on a server. I have many contributors that are not tech savvy, do not have server access, and do not know anything about git. But they are able to contribute via the ...
0
votes
2answers
171 views

Why are these seemingly unnecessary merges happening in git?

Consider this screenshot from our development repository: We are relatively new to git, so things are still somewhat confusing. The question at hand: If you take a look at the commits by me at the ...
6
votes
1answer
4k views

GIT workflow for web development

Long ago the small team of web developer I work with started using git for web development. Back then we just committed to staging or master directly and then merged frequently between the two. It was ...
0
votes
3answers
200 views

How come centralized source control solutions don't do branching in place

With centralized source control like Perforce and SVN, when they create a branch, they create a whole new directory. However, git and other distributed source control solutions, in my experience, are ...
-1
votes
1answer
53 views

What should be done on git while migrating new distribution and packet manager? [closed]

In the project I am working, we are using Freebsd and we are creating our software packages for it. Now we are planning to change distribution to Centos and rpm for packet manager. Since our codes ...
5
votes
1answer
76 views

Coping with build order requirements in automated builds

I have three Scala packages being built as separate sbt projects in separate repos with a dependency graph like this: M---->D ^ ^ | | +--+--+ ^ | S S is a service. ...
1
vote
1answer
96 views

Git Submodule for untracked folder?

I have a git repository with a folder in it. The folder is listed in my .gitignore file. I cloned another repository into that ignored folder from github. I may want to work inside of the new ...
0
votes
2answers
156 views

How to best structure Git for our team [closed]

We're starting to develop many small web projects in our company, where mostly they will have one shared resource with some code pieces (SDKs, utilities and etc...) Our team is small (~5) but is ...
-1
votes
4answers
226 views

What are some version control systems based on different concepts than Git, Mercurial etc? [closed]

Most of the version control systems I have used have a lot of similar functionallity for source code files: they work on their text content, diff using well known diff algorithms, the changes contain ...
1
vote
2answers
97 views

How does one store a website's holding/maintenance page in Git?

I'm trying to tidy up the Git repositories for the few sites that I maintain. For each site, I usually create a separate branch in the repo that holds a "maintenance page" or "holding page", which I ...
4
votes
1answer
266 views

If a dependency is not in the maven repository should I add it to source control?

One of the jar files that I use in my code is not in the maven repository(and yes I tried to avoid using it). I have installed it locally so when I build the project it gets picked up by maven. I also ...
6
votes
1answer
209 views

How to organize the dependencies of a project [closed]

I have a project built with Gradle, which contains libraries which can be used freely outside the main project, like this: The folders with a square at the bottom right are project modules. I want ...
6
votes
6answers
694 views

Git branches avoided by the office where I work [duplicate]

The place I work at does the following: They manage a dev version of an app They manage another replicate version of that app, they call this the rep version The live version of the app that is ...
3
votes
1answer
186 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, ...
5
votes
3answers
280 views

How can a manager ensure developers are pushing up to the origin every day?

Our team has been using Git for a couple of years. I love it, after previously using Visual Source Safe, SVN and TFS. However, my manager has been getting increasingly agitated about it and is ...
1
vote
1answer
80 views

Does it make sense to use tag without version numbers?

In our working group we had a discussion on using git tags in our projects. Some people argumented pro tags and some argumented against using tags. The crux is that we are talking about Magento ...
3
votes
2answers
110 views

How to handle versioning with multiple independent pull requests in a Git repository?

Let's say Alice has a Git repository, and the version is kept track of inside the repository (let's say package.json for npm). Bob sends a pull request to Alice which increments the version number ...
8
votes
1answer
12k views

Gitlab workflow, forcing code review or merge request on branch

I'm working towards implementing Gitlab at my company with a workflow strategy. My idea is that developers will be given access to repositories but, anytime they try to commit, their code must be ...
0
votes
0answers
70 views

Version Control & Deployment on Large Ecommerce Site

I am currently Front End Dev for a large ecommerce store and I'm wanting to switch the entire site to a Version Control System (Git) and Deployment service (Beanstalk). I'm having trouble ...
1
vote
1answer
72 views

Easily moving both direction of time during a rebase

After I have written some commits, I very often git rebase -i over them, in order to test them, if necessary split them, take parts form one commit and squash them to another, more appropriate one. ...