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

learn more… | top users | synonyms

0
votes
5answers
107 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
26 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
207 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 ...
0
votes
0answers
20 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
158 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
190 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
208 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 ...
19
votes
1answer
1k 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
252 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 ...
0
votes
0answers
92 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
1k 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
372 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
811 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
64 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
90 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
77 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
298 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
156 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 ...
4
votes
1answer
2k 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
170 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
50 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
69 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
70 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
136 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
203 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
87 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 ...
3
votes
1answer
168 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
188 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
656 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
164 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
268 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
78 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
91 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
8k 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
58 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
71 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. ...
1
vote
2answers
212 views

Branching strategy for frequent releases [duplicate]

We have very frequent releases and we use Git for version control. When i am mentioning about frequency, please assume it to include bug-fixes and feature release too. All releases are eventually ...
1
vote
2answers
266 views

Flaws in my PHP development setup - sharing sources causing lags

I have following development setup for my PHP projects: Working station running on Windows 7 with PhpStorm IDE. GIT for version controlling. CentOS on virtual machine (VirtualBox) with Apache and ...
4
votes
2answers
567 views

Understanding branching strategy/workflow correctly [duplicate]

I'm using svn without branches (trunk-only) for a very long time at my workplace. I had discovered most or all of the issues related to projects which do not have any branching strategy. Unlikely this ...
2
votes
2answers
163 views

How to be Agile when new work keeps affecting completed work?

The project I'm working on is to re-skin an existing website. The functionality will stay the same, it's just the styles that are changing. In other words, I'm not modifying the HTML, only the CSS ...
6
votes
3answers
425 views

Advice Needed: 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 ...
30
votes
4answers
7k views

Is backing up a MySQL database in Git a good idea?

I am trying to improve the backup situation for my application. I have a Django application and MySQL database. I read an article suggesting backing up the database in Git. On the one hand I like ...
4
votes
1answer
136 views

Is licensing an issue for Git Submodules?

For example: an MIT-licensed project wishes to simplify the build process for its users by including part of the GNU toolchain (which is of course GPL) as a Submodule. Could that be interpreted as ...
4
votes
1answer
169 views

How can I group commits in a version control system such as git

Instead of a one long flat commit history, why isn't there a hierarchy, so at the top level you might have pull requests, then you could go down a level and look at the commits in that PR. I realise ...
20
votes
2answers
690 views

How robust are Git commits when the power goes out?

One day I was using Git (I'm still using it) and the electricity went down while I was committing. When I (actually, the electricity) came back, the git repo was corrupt. I don't remember the exact ...
4
votes
1answer
94 views

Merging around 15 small Git repos of non-optional centralized web service components to a single large repo

In a centralized web service we break down the components into various small Git repos by software modules, e.g. authentication module, authorization module, data access module etc. (around 15 repos ...
0
votes
2answers
51 views

Should I use branches for example uses of a github repo?

I'm working on a Github repo called Designemplate at https://github.com/benwatkinsart/Designemplate and was thinking of developing some example uses of the CSS file to show how it's used. Should I use ...
4
votes
2answers
337 views

Where can I find “SVN for Git Users” resources? [closed]

So I took a job where the firm uses SVN (but will be moving to Git sometime in the future). The problem is that I don't know SVN. I've tried numerous Google queries and all I can ever find are ...
0
votes
2answers
457 views

Git: Branch or Fork?

I have game project that will have two versions: A simple version of the game, the core An advanced version of the game. I have the 1st version in my public repository and only I will be working ...
1
vote
2answers
1k views

CI runner on same server of GitLab?

I'm setting up a GitLab server in my company and now I'm adding GitLab CI to it. Before start this task I'd like to understand if there are any disadvantages running my runners on the same server ...