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

learn more… | top users | synonyms

2
votes
2answers
69 views

How do I manage a major overhaul of an open-source project with git?

I have a somewhat popular open-source project on Github, and I'm getting ready to do a major overhaul - completely different directory structure, substantially different versions of major components, ...
0
votes
1answer
65 views

GitFlow, should my release branch include minor version number?

I've found it difficult to find a definitive answer to this question. Using Semantic Versioning and GitFlow should my release branch include the minor version number? I'm not referring to tags. My ...
0
votes
0answers
20 views

Is there a way to group branches from separate Git repositories [using Visual Studio]?

At my job we are migrating from TFS to VSTS Git, though the VCS types probably don't really matter as much as how we're using them. We use VS2015 for development usually, in case that matters. The ...
6
votes
3answers
199 views

When to commit work in git?

When I'm working on a project, I tend to write a lot of code. A lot of code means alot of bugs. If I commit my work early on , I have to edit that commit when I encounter a bug and fix it. This is why ...
1
vote
1answer
42 views

How do I organize my project to accomodate GIT pull requests for source installed via PIP?

I want to structure my Python project in a manner such that others can use a package manager (PIP) to easily clone the environment for team development, and GIT to contribute to the project, plus a ...
1
vote
0answers
48 views

Is this a useful analogy between the blockchain and Git?

I am trying to understand the concept of the blockchain (the supporting structure behind bitcoins). To this end I am playing with an analogy between it and Git. My question is, if this is a valid/...
-2
votes
1answer
88 views

According to GNOME guidelines, should git messages end with a full stop, or not? [closed]

According to GNOME guidelines, how sentences should be written in Git messages? Should sentence in git commit message start with upper-case letter and end with a full stop, or lower-case without a ...
4
votes
2answers
137 views

Should I have a 'dev' branch separate from a 'production' branch?

I recently set up my staging and production server environments on Heroku and everything is working great. Through Heroku, you can deploy from a Git branch - e.g. master or my-feature. This got me ...
1
vote
2answers
129 views

Git - single or multiple branch

I am working on this project of mine where I am the only developer. I have chosen git for the version control for the project. Currently, I work from multiple systems and commit to the master branch ...
-1
votes
0answers
60 views

Suggestion for a git workflow

I need some suggestions from you about a (nearly perfect) git workflow. Let me tell you something about the project circumstances: We are developing a large application in four agile teams (about 6-...
0
votes
0answers
29 views

GIT - where/how do I save my Private SSH keys? [migrated]

I'm using Git, I want to have multiple keys. I'm reading I should use ssh/.config. The first thing I need to include is where to find the SSH key. Where do I save it? Do I just create a .txt file ...
0
votes
0answers
41 views

I've used Git with Github, but now I need to use it with something else. How can I add another SSH key? [migrated]

Sorry if this is not the right stackexchange. I have used Git with Github and that works well. I now want to use Git with my own website which is on a live site. My host provided me with an SSH ...
1
vote
2answers
61 views

Installing multiple versions of software with git

I'm really struggling to understand git, so here's a tighter rephrasing of a previous question I had asked. I'm going to explain a hypothetical scenario, detailing what I think happens when you ...
0
votes
0answers
47 views

Which git branches should I tag?

I read this nice post: Git branching and tagging best practices I really like the NVIE git branching model and I try to use something very similar: http://nvie.com/posts/a-successful-git-branching-...
5
votes
0answers
81 views

Are there any other Git porcelains other than the default one? [closed]

One of Linus's emails mentions the separation of the Git tools into the "plumbing" (usable by automated tools) and a user-friendly interface on top of the that (which has later come to be referred as ...
0
votes
0answers
88 views

Is updating a remote-tracking branch by local branch a good practice?

In Pro Git you can see: Remote-tracking branches are references to the state of remote branches. They’re local references that you can’t move; they’re moved automatically for you whenever you ...
11
votes
2answers
648 views

Where to push a failing test?

I just changed branch settings on my GitHub repository, so that my [next] branch requires a passing CI build through a pull request. A discussion followed with a number of team members, about failing ...
1
vote
3answers
134 views

Git: how to test local code before commit

Let's say I have two files I am working on - "a.txt" and "b.txt". I need to commit my change to "b.txt" but want to keep working on "a.txt" for some more time. I do a "git add b.txt". Now, before I ...
0
votes
2answers
103 views

git clone vs cp -R

I want to use an existing project as a starting point for a new project by copying or cloning it. There are at least two ways of doing this. Method 1: Copy it. cp -R /path/to/source /path/to/dest ...
0
votes
0answers
34 views

rebase equivalent - update specific branch?

If I reach the point where I am updating my local master: git checkout master git fetch upstream # I am pulling changes from develop branch into my local master git merge upstream/...
2
votes
0answers
69 views

Implementing redundant GIT backup scheme

I want to push a local repo to multiple remote GIT repositories to achieve redundancy in my backup scheme. So, let's say I plan to use Github and BitBucket to host my repositories. I have two ...
4
votes
1answer
166 views

small team git workflow

I want to ask if the following workflow is correct! It is referring to a small private team. There is a master branch where no one merges there ( except the maintainer ), a development branch and ...
6
votes
1answer
112 views

Why can't Pull Requests be seriously implemented in Mercurial?

A week ago, I was at LFNW and as I was talking with Larry Hastings after his talk, he said (paraphrased): There's something in Git that makes the Pull Request workflow possible that isn't there in ...
0
votes
1answer
30 views

Sharing Project configuration files for an application with Qt IDE using Cmake and sharing via Git?

Imagine that you are starting to work in a project with a group of people. You want to share your code and the full configuration files of CMake, Qt IDE configuration. So you if you want to test or ...
1
vote
0answers
68 views

Does TFS have the capacity equivalent of branching/forking in Git?

We've got talking about branching and forking in Git and a teammate asked if there's something like that in TFVC (hereafter referred to as TFS). I explained that there is, although it's managed ...
247
votes
14answers
24k views

Why does everyone use Git in a centralized manner?

I have used Git at my past two companies for version control. It seems from what I've heard that about 90% of companies use Git over other version control systems. One of the biggest selling points ...
1
vote
0answers
68 views

Working on the same file for two tickets

The company policy where I work is that code cannot be committed to SVN until a code review is complete. This is sensible enough as we don't want broken code ending up in the repo, but it does give us ...
7
votes
3answers
196 views

Version control on standalone (in-house) libraries?

Problem Statement At our company, we have various application projects that we work on and then we also have libraries that those projects need to utilize. I feel the need (based on some similar ...
1
vote
2answers
96 views

Github Parent commit committed after child commit?

I'm looking at this commit which was committed "26 days ago" and the parent commit which was committed "25 days ago". How can the parent commit be committed one day later than the child commit?
-2
votes
1answer
56 views

Repository UUID equivalent

I am converting an old Subversion repository to Git. Here is an example: $ svn info http://alfa.com/bravo/charlie Path: charlie URL: http://alfa.com/bravo/charlie Relative URL: ^/charlie Repository ...
22
votes
1answer
941 views

Can a git commit have more than 2 parents?

In this documentation it is mentioned A commit object may have any number of parents. But from my understanding, the only case where a commit will have more than 1 parent is when a merge has ...
4
votes
3answers
111 views

Feature branch which never made it into develop

I am cleaning up our git repository and there is a feature branch which contains a prototype of an interesting feature which the management decided not to include soon in the product. What do you do ...
4
votes
3answers
72 views

Using a git repository as the base of a new project

If I want to use for example the Electron Quick Start as the base of a new app, should I use a normal clone and just delete the .git folder, or is there a more elegant way of doing it?
1
vote
1answer
54 views

Suggestions: Good format for short/commit messages for User Story and Sub tasks

I would like your opinion regarding a good style/format for short messages when committing into a repository (GIT or SVN). Considering we are using a feature branch development approach, with one ...
2
votes
2answers
159 views

Is it wrong to git push force branches?

When I'm working on a feature branch, I tend to want to cleanup the commits in the branch using an interactive rebase before my work is reviewed and integrated in the main branch. During development ...
3
votes
1answer
113 views

Best ways to manage my Git repositories with projects sharing the same code [duplicate]

My background: I was programming for many years, but have never used a version control system. I felt, that such a system would save me a lot of time and allow me to be more productive, but I never ...
0
votes
1answer
401 views

Recommendations to organize code changes in GIT

I'm looking for an advice reflecting my point of view. First, I will explain my point of view. My point of view I'm working in a big company as a C++ developer, we are using GIT. I'm going to make a ...
17
votes
2answers
283 views

Optimize a git repo, containing large binary files

Our project is about 11GB, 10 of which are binary data (.png images). Consequently, a git diff or git status operations take up more than a minute. Fortunately all data files are separated into a ...
0
votes
0answers
58 views

What is a good directory structure for projects with versioned code but huge data files

We work with genomics and imaging data. Our data are large, but our code is small. We sometimes work on code collaboratively, and also wish to share it with the researchers we do analysis for. We are ...
-2
votes
1answer
37 views

Handle multiple parallel wide modifications using branching in VCS

Here, the term of branch is understood as a git branch. I don't know how branch works in other VCS, but its probably VCS-agnostic. Given a branch base, and around it many other "satellites" branches, ...
26
votes
5answers
1k views

The trend of the “develop” branch going away

I've noticed something lately looking at some popular projects on GitHub, that there's no develop branch. And in fact, the GitHub Flow guide doesn't mention it either. From my understanding, master ...
2
votes
1answer
50 views

Workflow and process when branches have dependencies in git for code reviews

A fairly common workflow for working with git is: Fork master Make changes/add functionality in branch Make pull request for your branch vs master Merge pull request (after code review, automated ...
3
votes
2answers
223 views

Docker, microservices and git workflow

We are a young company that's developing a web app in node.js with the microservice architecture. Actual development workflow: Each microservice is stored in a private repository Different ...
11
votes
4answers
687 views

How to “start over” in GitHub?

I plan a complete rewrite of my project, using another framework etc. It would be nice to keep the old code including history for reference. What is the best way to do this, in order to avoid risk, ...
2
votes
1answer
71 views

Structuring git repository as a 'catch-all'

I have a really old install of Debian on my Thinkpad, and I want to refresh it now that I'm using it again. However, I have a LOT of old scripts all over this install for beauty fixes, shortcuts, and ...
1
vote
1answer
71 views

Best practices for working with public_html folders and git

Currently, everything that is in the public_html folder automatically gets published live. The git repository is also inited in this folder (though this can change if it's necessary). What is a good ...
1
vote
2answers
101 views

Best practice for creating defined versions in git

In my company we have a 'production pipeline', which is a bunch of code which we use to produce data, with the data later shipped to customers. The code is still being developed, bugs get fixed etc. ...
5
votes
3answers
246 views

In GitHub flow, is it OK to base feature branch on another feature branch?

We use GitHub Flow in our project and most of the time, we open a new feature branch from master, do some work there, open a PR, review the code and merge back into master. However, my current work ...