Tagged Questions
-1
votes
4answers
175 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
72 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
103 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
152 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 ...
1
vote
1answer
70 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 ...
2
votes
2answers
55 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 ...
0
votes
0answers
46 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
2answers
100 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 ...
2
votes
0answers
75 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
162 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 ...
0
votes
1answer
80 views
State-of-the art Mercurial workflows [closed]
Having solid git knowledge under my belt, I occasionally use mercurial, especially when patching a HG based project. I feel slightly uncomfortable, because my knowledge of mercurial is limited and ...
0
votes
1answer
68 views
Strategy for maintaining offline repository safely using git [closed]
I use git for versioning. Just yesterday I was working on refactoring my Python code base. After adding a test I found that I had introduced a bug in one of project euler solutions. So I checked out a ...
1
vote
7answers
129 views
How can I use different versions of an evolving library in different projects?
The problem
I write a lot of exploratory code in my research. As I go along, I put functionality that I'd like to reuse in a central location. A project might look like this:
./mylib
./exploration
...
0
votes
2answers
176 views
Should I use git for project files, other than the actual source? [duplicate]
I have a lot of small projects, and while their source code is backed up and tracked with git, I don't know what to do with the rest of the files associated with a project.
These consist of small ...
1
vote
1answer
119 views
Should we be using git branches or separate repositories?
So I have talked my employer into finally jumping on version control...up until now my experience with git has been for personal projects and freelance work where everything is on one server, or small ...
1
vote
1answer
303 views
In git, is it a bad idea to create a tag with the same name as a deleted branch?
I have a project with a git branching model that roughly follows that of nvie's git-flow.
Our release branches are named in a SemVer format, e.g. v1.5.2
Once a release branch is given the green ...
4
votes
4answers
209 views
Techniques to avoid entangling git merges when working on an extensive change
I am absolutely miserable when I get in a situation where I have to merge other developers' changes into mine. When using git and working on a really extensive change, that happens a lot.
When I ...
9
votes
5answers
1k views
Is it reasonable to use git only on my local machine?
Is it ok to just use git only locally? I don't want to have to pay for a service that provides private repositories (such as Github) but I think git is a great way to organize my closed-source ...
17
votes
6answers
741 views
When should I stop committing to master on new projects?
Whenever a new project starts, it usually makes sense to start by committing straight to master until you've got something "stable", and then you start working in branches.
At least, this is how I ...
11
votes
4answers
387 views
Moving a multi-GB SVN repo to Git
Currently my company has a Visual Studio solition in an SVN repo that's organized as follows:
SolutionFolder (~3.5 GB)
|-> SolutionName.sln
|-> .. Some source code folders... (~250 MB)
|-> ...
4
votes
2answers
155 views
Sharing only part of code with git
The situation
I have code which has features X and Y.
Bob needs access to the code to help develop feature X further.
Normally I would allow Bob to clone the code, but the problem is that feature Y ...
2
votes
4answers
287 views
How to minimize merge conflicts when using non-lock VCS like git?
I have been using git for about four months now. While I like most of its features, I find it rather inconvenient that multiple developers can make concurrent changes to the same file and then a need ...
25
votes
5answers
2k views
Why do so many websites prefer “git rebase” over “git merge”?
One of the advantages of using a DVCS is the edit-commit-merge workflow (over edit-merge-commit often enforced by a CVCS). Allowing each unique change to be recorded in the repository independent of ...
12
votes
1answer
368 views
Etiquette for editing someone's pull request
I own a repository on GitHub to which someone sent a pull request with one single commit. I only want to implement his solution partially, and use about half of the code changes the user made. What ...
3
votes
1answer
76 views
Could a reflog replace tags for bookkeeping?
My repository has a branch production and is filled with countless tags of the format production-20130101-1234 that point to what has been actually shipped on the given datetime.
I think this ...
19
votes
10answers
1k views
Is it ever OK to commit non-working code?
Is it good idea to require to commit only working code?
This commit doesn't need to leave the repository in a working state as:
... we are in early design stages, the code is not yet stable.
...
3
votes
2answers
78 views
Placing images into Git for a CRM
I have built this CMS that has the option to add entries to the database. Each entry that is created has about 5 to 10 new images showing the product for sale. Each image is about 150Kb in size.
I ...
4
votes
2answers
347 views
Git Staging: When to stage? What to do if modification occurs afterwards
I'm rather new to the broad world of Git. I have read the manual and have been practicing but I am confused about few aspects of it, which I couldn't figure out after searching for.
I'm wondering:
...
1
vote
1answer
147 views
Using Git - better to do lot of incremental updates or one big daily update? [duplicate]
Ive just started working with Git (Github) in anticipation for an up coming project I'm project managing and designing and developing the front end of.
One thing I couldn't work out is, is it ...
6
votes
2answers
578 views
Git for a solo developer [duplicate]
I'm a developer working on a Wordpress project. I work on this alone and I want to improve the way I use Git but I don't know where to start.
Currently, I'm using git to commit all of the work that ...
30
votes
6answers
1k views
Are Frequent Complicated Merge Conflicts A Sign of Problems?
On our team, we use Git as our source control. We have several areas of code that are almost independent but have some overlap. Lately we have been discussing workflows and approaches to using source ...
1
vote
1answer
143 views
Under what conditions should I rebase rather than merge?
Here is, roughly, our structure of work using git, for web development. We have a master branch, and individual or groups of work are done seperately in branches, then merged in.
A ticket (or ...
58
votes
5answers
4k views
Why does git use hashes instead of revision numbers?
I always wondered why git prefers hashes over revision numbers. Revision numbers are much clearer and easier to refer to (in my opinion): There is a difference between telling someone to take a look ...
5
votes
1answer
137 views
Can the version of Git vary between team members?
We are about 40 developers working on the same code base and we use Git for version control.
My question is: can there be problems if, for example, some developers have a much older version of Git ...
7
votes
2answers
822 views
How to convert a Bazaar repository to GIT repository?
We have a large bazaar repository and we want to convert it to a git repository. The bazaar repository contains the folders of each of the interns. Any documentation/code prepared by interns is ...
18
votes
6answers
1k views
What does “branching is free” mean in Git?
What does "branching is free" mean in Git?
I hear this a lot whenever Git is mentioned in comparison to other version control systems.
I haven't had the opportunity (?) to deal with others (SVN, ...
1
vote
1answer
110 views
Git tracks _lines_ of code. Is there something that track _words_?
In git if I change a character in a line the entire line is considered changed.
I don't know much but stackexchange seem to track changes in a word-by-word basis in the edit history.
Is there an ...
10
votes
2answers
348 views
Big project layout : adding new feature on multiple sub-projects
I want to know how to manage a big project with many components with version control management system.
In my current project there are 4 major parts.
Web
Server
Admin console
Platform.
The web ...
3
votes
1answer
237 views
What's a typical team size using a Git repo?
We've been using Git as our version control but as the team grows, there are more and more pains when it comes to getting all our changes onto a single branch ready for a deployment.
I'm wondering ...
2
votes
1answer
200 views
git tagging comments - best practices
I've adopted a tagging system of x.x.x.x, and this works fine. However, you also need to leave a comment with your git tag. I've been using descriptions such as "fixes bug Y" or "feature X", but is ...
0
votes
1answer
283 views
Git Branch Model for iOS projects with one developer [duplicate]
I'm using git for an iOS project, and so far have the following branch model:
feature_brach(usually multiple) -> development -> testing -> master
Feature-branches are short-lived, just ...
3
votes
2answers
646 views
Third party libraries in an open-source C# project
I'm going to start an open source project from scratch, using git (via github) to manage the source. The project will be written in C# and will depend on at least two external libraries (more are ...
1
vote
2answers
4k 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 ...
1
vote
1answer
337 views
Using gerrit (or similar tool) on a team where multiple devs work on a single feature
We have a team of roughly ~8 devs who regularly work on the same feature over the course of a 3 week sprint. It isn't quite pair programming, but in our current workflow devs regularly push up ...
-1
votes
3answers
137 views
GitHub access to repo: only with URL? [closed]
I'm finishing my dissertation and want/need to provide the source code of some analysis scripts I've used. I did all the version control with git. Because I want to publish the results generated with ...
2
votes
2answers
968 views
So I'm a developing a workflow with vagrant+git…does this make sense?
Relevant Background Details
We've got two types of VMs (Utility Boxes & Web Servers) that developers need.
We are going to be using git for version control.
We have developers who have ...
5
votes
3answers
533 views
Manage version control with a central development server (LAMP)
I'm working in a small team with up to 5 (web)developers. Because our team is growing frequently and we ran into problems with multiple people working on the same code we decided to set up a VCS.
...
4
votes
1answer
523 views
Is git-flow in the spirit of git? [closed]
The question is pretty self-explanatory. I've had some experience with git-flow, and not much more true experience with plain git before that. (I was using it more as a backup-provider.) I'm ...
9
votes
5answers
400 views
Is it a good practice to have a remote branch for each developer?
Is it considered a good practice to have a remote branch for each individual developer in the project?
We're using Git with the following branches:
master
release
develop
If each developer had ...
2
votes
2answers
370 views
Has anyone used git as a runtime datastore in their application? [closed]
I used to work on a document workflow system, and it basically implemented a half-baked version control system for documents; using a database for versioning information and a filestore for the files. ...
