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

learn more… | top users | synonyms

-1
votes
0answers
11 views

Update Fork from master problems

I'm currently contributing to an OpenSource Project on GitHub. The problem I currently have, is that every time a PR was merged, when trying to update my fork, it will show for example "this branch is ...
1
vote
1answer
132 views

Fork Management of Git Multi-level Hierarchies

We have the following Git hierarchy structure in place, where each child is forked from the parent. If we build something in Client1 that will be useful in the entire hierarchy, what is the best way ...
0
votes
1answer
23 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 ...
-2
votes
0answers
14 views

How to open 2 Visual Studio instances, with same Git projects and different branches [migrated]

I am needing to open 2 Visual Studio instances, one will be opened for me to just look the code of the Project X /Branch 1. Another, will be used to code in the Project X / Branch 2. How to do that ...
1
vote
0answers
53 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 ...
5
votes
2answers
273 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 ...
243
votes
14answers
23k 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 ...
9
votes
4answers
7k views

Why should large financial/insurance companies use git and/or github

I work for a large enterprise (30K employees) in the financial/insurance industry. While "IT" isn't our main focus, let's be honest, these are information driven industries and the companies with the ...
0
votes
0answers
63 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
176 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 ...
0
votes
0answers
43 views

What is the purpose of 'Staging' in git [duplicate]

I have seen a lot of questions regarding 'staging' and their usages. I have seen this question and it answers only the what side and not the why side of the question. I know that staging means that ...
1
vote
2answers
73 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
47 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 ...
16
votes
4answers
3k views

Workflow: Using binary document formats in Git without locks (moving from subversion)

We're a software consultancy with a multitude of projects for different customers. We traditionally use Subversion, but are currently considering moving to Git. A significant portion of the documents ...
20
votes
1answer
884 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 ...
2
votes
1answer
68 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 ...
0
votes
2answers
898 views

Correct way to undo the past few git commits including a merge? [closed]

My team is working with git for the first time and has really messed up our git remote due to our inexperience. I'm trying to help educate them on git to solve the problem in the long term, but in the ...
15
votes
4answers
6k views

How can I organize personal git repositories?

I'm in the process of setting up a GitHub account with the plan of making a pair of libraries I developed as parts of some recent iOS projects freely available for other iOS devs to use. I don't ...
3
votes
3answers
105 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 ...
2
votes
3answers
259 views

Handling “backup” files with Git

I have a project folder that has multiple duplicate files that are named slightly differently to create "backups". So I have "file1.txt" and "file1 backup.txt". Is there a preferred method to capture ...
3
votes
3answers
66 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?
20
votes
4answers
6k views

code review with git-flow and github

With regular git and github I can do a code review by simply creating a pull request of the feature branch I'm working on to the master branch. How would I do code reviews with git-flow? With workflow ...
1
vote
1answer
44 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 ...
0
votes
1answer
389 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
264 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 ...
2
votes
2answers
118 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
89 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 ...
22
votes
6answers
565 views

Splitting coding progress into meaningful commits without too much overhead

When working on a fix or a feature, I sometimes stumble over other tiny issues that can be improved on the fly in a matter of seconds. When I do them immediatly and then commit the finished ...
0
votes
0answers
39 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 ...
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
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, ...
17
votes
4answers
16k views

Keeping git repositories on different hosts in sync

I am thinking about starting a small project and I want to make its versioning with git. Bitbucket seems a good option for me with their free plan. I want to use it as the main tool for working with ...
14
votes
2answers
1k views

Is the git “Golden Rule of Rebasing” so essential?

I had a discussion recently with people absolutely opposed to a rebase strategy of feature branches on GIT. It seems to be an accepted pattern to use rebase only for local, private branches but never ...
10
votes
3answers
1k views

Why doesn't git merge adjacent lines without conflict?

I recently learned that when merging two branches in git, if there are changes on two adjacent lines git declares this a conflict. For example, if file test.txt has this content: Line 1: A Line 2: B ...
11
votes
4answers
615 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, ...
3
votes
2answers
151 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 ...
2
votes
1answer
48 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 ...
6
votes
3answers
2k views

Appropriate Git workflow for multiple active releases while handling hotfixes

I'm trying to choose a Git workflow that is most appropriate for our product. Here are the parameters: We do a few major releases a year, let's say 10 at the most We have multiple versions of our ...
1
vote
1answer
62 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
100 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. ...
15
votes
7answers
701 views

Why not commit unresolved changes?

In a traditional VCS, I can understand why you would not commit unresolved files because you could break the build. However, I don't understand why you shouldn't commit unresolved files in a DVCS ...
8
votes
3answers
284 views

Accidentally including unrelated changes in commits

My personal approach to a git commit is that every commit should include a unit of change, in its completness. When I develop, I usually focus on such units. But sometimes, my attention strays ...
5
votes
3answers
196 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 ...
4
votes
1answer
974 views

Why aren't there cherry-pick requests?

One disadvantage to pull requests (aka merge 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 ...
2
votes
2answers
76 views

Pull requests and work item linking in Visual Studio 2015 with non-TFS remote Git repo

We use TFS and Visual Studio 2015 at work but don't get full benefit from the ALM features as we have code in non-TFS Git repos. We would like to integrate these products in with all the TFS goodies ...
2
votes
1answer
90 views

Should we use a monorepo?

My team is planning a migration from subversion to git. We support 3 applications... 1 is primarily for internal users, 1 is for corporate "partners" and 1 is for end users. These applications share ...
4
votes
2answers
130 views

merge vs rebase pull requests on github

I am actively working on a two person project with very few longstanding feature branches (longest existing branch is 3 weeks). I have spent the afternoon trying to understand merge vs rebase and ...
127
votes
5answers
50k views

Choosing between Single or multiple projects in a git repository?

In a git environment, where we have modularized most projects, we're facing the one project per repository or multiple projects per repository design issue. Let's consider a modularized project: ...
102
votes
10answers
42k views

Should images be stored in a git repository?

For a distributed team that uses Git and Github as version control, should images also be stored in the git repository? For the most part, the images won't be changed. The folder containing them will ...
5
votes
1answer
98 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 ...