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

learn more… | top users | synonyms

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?
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 ...
5
votes
0answers
450 views

Visual Studio, Git, and common code

I'm looking for some advice on how I should arrange a large new project I'm working on to allow it be more easily managed in Git (using GitLab), and developed in Visual Studio. To give an idea of ...
4
votes
0answers
122 views

Is there a simpler way to help testers push code to a testing branch?

I'm a amateur programmer, I'm not used to working with Git. It's my job to help test new code, for a while now this has included pulling the branch containing the issue, merging it with the main ...
3
votes
0answers
109 views

Documentation of code review

In a project we have a rather formal code review, which is currently done manually and documented in Excel sheets and Word docs. We would like to improve the current code review process by ...
3
votes
0answers
99 views

Proper GIT repository usage that accommodates feature branches and parallel testing

After reading around I found that there were various git workflows being used but there aren't enough (or I just haven't found them yet) info on how to use git properly with having test builds. I was ...
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
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
0answers
59 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 ...
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 ...
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 ...
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 ...
1
vote
0answers
105 views

Git Repositories updated

I would like to keep two Git repositories updated. First one, is GitHub open source project that gets updated frequently. Second one is a private held Git Repo located other than GitHub. This one ...
1
vote
0answers
73 views

What git process when it says “removing duplicate objects” on merging branches?

Git displayed "removing duplicate objects" after I merged a branch to another and noticed my .git/objects folder has significantly reduced (from 40.7 MB to 33.5 MB). Isn't branch just supposed to be ...
1
vote
0answers
113 views

Version Control for several projects

I've found several things about how to manage a data science projet with GIT but I didn't find something about how to manage a set of projects. In 90% of the case I'm working alone and over the ...
1
vote
0answers
69 views

How to credit authors when open sourcing a fresh snapshot of a private repo?

I've read through How to open-source a project whose git repository has copyrighted media in the history? but my question is: how to credit authors when open sourcing a fresh snapshot of a private ...
1
vote
0answers
29 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 ...
1
vote
0answers
164 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 ...
1
vote
0answers
165 views

GitShell, how can I not type the username and passwords?

Open the CMD, and I should type the password and usename? In the GitShell opened by shortcut, I don't need to type the username and password. Related is here: How can I convert GitShell's ...
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 ...
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 ...
0
votes
0answers
51 views

Workflow for maintaining a partially diverged fork

I work on a code base where I maintain a fork that is diverged from the upstream slightly. The project is about 5 million lines, and in general the developers and the users of a the code are the same ...
0
votes
0answers
93 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 ...
-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 ...
-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 ...