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

learn more… | top users | synonyms

1
vote
1answer
28 views

How to organize remote Git branches when team does single change releases?

I am a member of a project team with somewhat unusual (or at least from my perspective) release methodology and team dynamic. The way we have been doing releases is rolling out a single functional ...
-1
votes
0answers
25 views

When rebuilding an package from an updated repository, is there a way to skip compilation on files that haven't changed?

I know this is a bit of a shot in the dark, but when I update a repository (c, c++, and so forth) and know that only a few files have changed, it's aggrivating to have to have everything recompile on ...
5
votes
3answers
68 views

Git, semantic versioning and how it fits into (my) a typical development timeline?

I'm working on a Q&A system and about to tag my current application with "1.0.0" for it's first official version/tag. It's about to be rolled out for beta testing to a limited test audience next. ...
-1
votes
0answers
14 views

GIT hangs when pushing [migrated]

When i try to push my code to git it just hang, no error messages just standing still. Counting objects: 10, done. Delta compression using up to 4 threads. Compressing objects: 100% (7/7), done. ...
3
votes
1answer
58 views

Should I rename package after Android app name change?

I have an Android app. I have changed the app's name from appname1 to appname2. I would like to know if I should also change my package name from com.myname.appname1 to com.myname.appname2 to reflect ...
4
votes
2answers
239 views

Why does Git have tags?

I've read Git branching and tagging best practices and git tagging comments - best practices, but I don't see a direct answer to something I've wondered for a long time: Why does Git have tags? ...
3
votes
1answer
110 views

Is it good to split big repository into smaller ones to have separate history/issue etc or keep it big?

We are currently porting our huge svn repo to git and we are thinking to export subdirectories of repository, each one containing source code of independent binaries, documentation or robot tests, ...
2
votes
1answer
55 views

How to reconcile “misc fix” commits with pull requests?

I work in a small company, where I used to be the only developer. We recently welcomed a few other people on the team, and started thinking about how to organize development efforts. I am pretty much ...
-2
votes
0answers
19 views

cygwin git “Protocol ”https“ not supported or disabled in libcurl” [migrated]

I'm using cygwin under Windows 7. Everything was fine until one day I found that I cann't use git to clone github repos and it says "Protocol "https" not supported or disabled in libcurl". But when I ...
2
votes
1answer
69 views

Git workflow for Microsoft SQL Stack

My team of developers are currently working at a client who has required us to move away from SVN and begin using their native workflow program. (Source tree by Atlassian). We are data warehouse ...
-2
votes
0answers
77 views

Should I use Git? [duplicate]

Sorry but I fail to understand the concept of Git. So I am developing a project (commercial, closed source). I will, perhaps, one day, look back at the code that I developed a few months ago and see ...
2
votes
1answer
55 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 ...
0
votes
3answers
122 views

Does frequent committing prevent merge conflicts?

Is there any situation, where git merge command uses frequent committing in one or both branches to prevent merge conflict (as opossed to one giant commit of week-long work followed by immidiate ...
2
votes
1answer
88 views

Shared code across many (web) projects using git

I work in a small team that creates and maintains quite a lot (> 100) of ASP.NET website projects. Our current workflow is that our projects are all located on a network drive, which everyone works ...
0
votes
1answer
32 views

Advice on structuring a Git repo into branches for an iterative tutorial [duplicate]

I'm a teacher and I'm about to publish a tutorial on how a build a PHP app in several iterative steps. At each iteration, I want to provide access to the associated source code and differences with ...
1
vote
1answer
55 views

How to avoid old commits/PRs that are painful to merge?

We have a pretty good code review process, but there are couple of issues. The most annoying problem is merging. From time to time the number of stuff to merge grows rapidly and some of the commits ...
4
votes
0answers
109 views

Putting together a business case for moving to git from TFS? [closed]

I'm probably going to be giving a presentation to my company (mainly management, but also senior developers) on the benefits of moving to Git from a centralized TFS setup. I know that I massively ...
2
votes
1answer
84 views

Why does Git's stash commit need two parents?

Why does Git's stash commit need two parents? In the Hacker's Guide to Git, I see this mental model for stashes: The guide tells me that stash@{0} needs both A and B as parents. Why? Why doesn't ...
0
votes
1answer
104 views

Developer Branch vs. Feature Branch [duplicate]

I saw around that development teams usually use source control in one of 2 schemes: Either "Feature Branch", where each feature is developed in a new branch, or "Developer Branch", where each ...
0
votes
2answers
54 views

VCS - Better way to change location than pushing to branch?

I work from multiple locations quite frequently, and there's times (16:59 on a Friday for example) when I need to leave quickly with potentially unstable code. Right now I tend to commit and push the ...
1
vote
2answers
57 views

Merging very big branch with master [duplicate]

I have rather big git branch with code that was created on may of this year and never before was merged with master. Compare shows huuuge difference between branch and master: about 50 new files and ...
0
votes
1answer
19 views

Tag and/or branch strategies for environments when using git

I've been researching git deployment flows and have seen many post-receive hooks that will check out master. Few of them however detail how you might set up a beta server that could be running any ...
0
votes
3answers
126 views

Is seeing loads of merge messages in a git branch standard, or are we working incorrectly?

We're in the process of switching from SVN to git, and I've noticed that we're seeing a lot of these commit messages in git: Merge branch 'development' of [Url to Origin]. These are coming in where ...
28
votes
3answers
941 views

Why squash git commits for pull requests?

Why does every serious Github repo I do pull requests for want me to squash my commits into a single commit? I thought the git log was there so you could inspect all your history and see exactly what ...
0
votes
3answers
84 views

Git and merge commits

We have three branches: master staging dev We branch per issue and each issue needs to go through testing and staging before being merged to master. We branch feature branches from master and ...
3
votes
2answers
100 views

What is the utility of the predictable SHA's in git?

I am learning git. I am wondering why the git spec is explicit about how the commit SHA's are calculated? It is my understanding that the delta blob (the unit-of-work) is calculated into this SHA as ...
1
vote
2answers
89 views

Git push to deploy technique [duplicate]

I'm adopting a git push to deploy method where I setup a bare repository on the live server which I push my local changes to. Using a post-update hook, executed after I've pushed I pull my changes to ...
2
votes
1answer
56 views

Can tags be used as bookmarks under semantic versioning?

Shameless plug: this question is for StackMode – a StackExchange client for GNU Emacs 24+. The product I'm working on, version-controlled with git, is a desktop application with an innately exposed ...
0
votes
3answers
104 views

Something like “tracking” for local branches in git?

I often have a workflow where I develop some feature in a Git branch, switch to another feature-branch, etc. During development, the original develop branch and the feature branches diverge. Now when ...
2
votes
3answers
313 views

How Best Can I Use Git When My Employer Uses VSS?

I am going to be working with VSS but I am much more productive and diligent with GIT. I have to fit within the workflow of VSS and keep good history in VSS. The standard work flow here with VSS is ...
2
votes
1answer
69 views

Use git to manage different deployments of the same repo

I have a web application built in PHP. I want to use Git to manage the different aspects of the deployment. Now some of the files in the web app are specific to a client (logos, database connection ...
2
votes
1answer
85 views

Managing shared code in source control

Projects A and B both use library project L: Judging by what people have written about it on the web, managing this situation appears to be a headache: ...
0
votes
1answer
95 views

How often to open pull requests [closed]

We are planning to use Git pull requests for code review in our company. Before we start I have a basic question: How often should I open a pull request? Is it best to open one for every little commit ...
3
votes
3answers
103 views

Grouping multiple git repositories that are part of the same overall project

Let's say I have a project that has multiple components: a server component, a webapp component, an iOS component, Android component, etc. These components are all separate codebases, but are also ...
1
vote
3answers
359 views

Why is having merge bubbles in your git history not actually that bad?

In the past year, most of the rest of my group (of engineers that I work with), has ended up deciding that merge bubbles really aren't that bad. At the very least, I'm seeing that other developers ...
20
votes
3answers
2k views

On GitHub, etiquette and pull requests [duplicate]

If someone forks your repository and commits some changes, what is the accepted way to proceed if you'd like to ask them whether it's alright to pull those changes in? Can you issue a pull request on ...
0
votes
1answer
76 views

snapshot in git or version control system (vcs) [closed]

I recently started learning/working git. I've gone through some materials but still didn't understand what actually is a snapshot.
2
votes
1answer
52 views

Is a guardfile part of the private developers environment or the public OSS project?

Let us say I have an open source project on github. Now I wish to include tools required to develop the project so others can easily contribute. It is hard for me to tell when these tools should be ...
0
votes
0answers
33 views

Git Workflow for multiple sites sharing common functionality [duplicate]

Apologies if you've heard this question or variants of it multiple times before. However, I have the following situation: We develop a site using Drupal/Wordpress - let's call it Site Foo_A. We're ...
0
votes
5answers
102 views

Should private key files be checked-in in git?

In my understanding, git as version control system should track all resources or files that are necessary to build a software version. If a private key file is needed for a server to function ...
0
votes
0answers
26 views

Should I keep JBoss under version control? [duplicate]

Should I keep my JBoss installation under version control so other team members can pull it? Is that common? Configuration changes, module installations etc would be version controlled. I have a ...
3
votes
3answers
197 views

How do you identify bugfix commits on QA environment with Git repository?

I got used to the following approach on bugfixing phase of the project development. The developer should add SVN commit number as a comment to the JIRA issue when resolving it. Latest artifact from ...
0
votes
0answers
18 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 ...
2
votes
2answers
154 views

Best Git workflow suitable for our needs

I need help with the workflow that is best suitable for our needs. We are a 3-4 person team and are working on 4 different projects. We have three main branches: master - deployable production ...
2
votes
1answer
180 views

Why aren't there cherry-pick requests?

One disadvantage to pull 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 non-sequential history. A - C - E ...
1
vote
1answer
190 views

How to enable non technical users to use GitHub

We're currently storing two Dynamic CRM solutions in Github and have triggers to automatically deploy these solutions once a change has been pushed to the master branch. This works really well in ...
18
votes
1answer
1k views

Are Git branches, in fact, “homeomorphic endofunctors mapping submanifolds of a Hilbert space”?

As we all know: Git gets easier once you understand branches are homeomorphic endofunctors mapping submanifolds of a Hilbert space Which seems like jargon, but on the other hand, All told, ...
1
vote
2answers
249 views

Organizing code in a 2 man team

I've been working with a buddy of mine on a school project. We forecast it'll take ~2 months, so it isn't a small scale project at all. Communication and splitting the work effectively has been a ...
0
votes
0answers
89 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 ...
9
votes
4answers
994 views

How to use github, branches and automatic releases for version management? [closed]

I understand most of the basic Git/Github concepts by now, however I still have trouble understanding the bigger picture. These are some things that I have managed to get working so far: Push ...