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

learn more… | top users | synonyms

0
votes
0answers
26 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 ...
2
votes
0answers
54 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 ...
-2
votes
0answers
25 views

Taking an update with uncommited changes in GIT… no merge conflict?

I have some changes I have made to my GIT repo but have not yet committed. I then took an update and some of the code that was merged overwrote my initial changes that I had not committed yet... Isn't ...
-2
votes
0answers
69 views

Setting up Git in a Company with too much data

I just wanted to know what is the best practices for GitLab Server with www data more than 3TB. The GitLab Server is capable to have more than 3TB of data, which has more than 100 projects. But our ...
4
votes
1answer
106 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
99 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 ...
-2
votes
0answers
25 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 ...
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
58 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 ...
244
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 ...
1
vote
0answers
65 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
181 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
82 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
52 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 ...
21
votes
1answer
888 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
107 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
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?
1
vote
1answer
46 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
119 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
90 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
391 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
267 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
41 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
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 ...
3
votes
2answers
156 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
627 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
69 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
64 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. ...
5
votes
3answers
200 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 ...
3
votes
1answer
92 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
133 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 ...
6
votes
1answer
100 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 ...
0
votes
1answer
67 views

Managing a project on github in different repos or one? [duplicate]

An app I am working on (iOS) is being distributed to different businesses and each business needs a few customizations to said app before it is distributed to users on the app store. Most files will ...
22
votes
6answers
566 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 ...
2
votes
2answers
77 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 ...
1
vote
0answers
67 views

Multiple git committers on same repo and machine with forwarding agent

I have a remote machine where multiple developers work on the same repository. We use gitolite and SSH keys to manage git access. As for now we code on the local machines, commit, push, pull remotely ...
6
votes
4answers
216 views

Is there any downside to commit messages containing the ticket number

I was wondering if it would be good practice for commit messages to contain the ticket number they were apart of. It would be like 2568 Fix heating issue Summary of the issue with a bunch ...
1
vote
1answer
114 views

Development workflow for a team: local to live (with GIT)

We're trying to put together a workflow for Wordpress development which turns out to be pretty complicated with lots of elements. Is there a way to streamline this or filling in the gaps? We ...
2
votes
0answers
86 views

Combining GitHub and TFS / Visual Studio Team Services

I wonder if it's possible to combine Visual Studio Team Services and/or TFS with a GitHub repository. We think both products have their own advantages and would like to work on one repo within our ...
1
vote
1answer
114 views

More than one deployable git branch

My dilemma is about the GIT flow. Let's assume that I have an application that can be deployed differently (staging release, QA release, production release). Since the application has profiles to be ...
0
votes
1answer
174 views

Git Bisect found the buggy commit. Now what?

I've seen blog posts explaining how to do Git bisect, but how to you fix the bug, commit again and maintain the rest of the commit history? An actual problem I faced in my project was like this (the ...
3
votes
1answer
56 views

Isn't the master branch just a surrogate of tagging in the gitflow model?

Reading the gitflow model, it seems to me that the master branch is there only to provide a branch where to store stable versions. What does that add to just tagging develop with the stable versions?
4
votes
1answer
71 views

Do feature fixes need to be local only?

From this blog post describing the git-flow model, it seems that feature branches have to remain local to the user working on them and are actually deleted right before pushing to origin. This kind ...
1
vote
0answers
47 views

Where do bugfixes go in the git-flow model?

In the, commonly referred to as, Git-flow model hotfixes go in their specific hotfix-* branch and small integration fixes right before release go in the release-* branch. General bugfixes from the ...
8
votes
3answers
198 views

Git branching strategy for long-running unreleased code

At our team, in addition to individual units of work (Stories), we have longer-running themes of work (Epics). Multiple stories make an epic. Traditionally we've had feature branches for each Story, ...