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

learn more… | top users | synonyms

-1
votes
1answer
28 views

Best practices in managing nuget repositories [on hold]

I've been involved in a project using Visual Studio 2012 that has multiple solutions and multiple projects. In most cases, one solution will have to refer to the library build in a different project. ...
25
votes
9answers
1k views

Commit at a logical checkpoint only, or also when you're at a stopping point? [duplicate]

Life, the work day, and personal projects don't always give us the opportunity the commit code at a logical completion (functionality subset programmed, bug fix completely patched, etc.). Sometimes ...
-2
votes
1answer
49 views

InteliJ Git vs GitHub for Windows vs SourceTree [closed]

So I'm a bit curious as to what is the best practice when using version control. I've been using SourceTree(w/ mercurial) at work but have used as well for my course assignments with (Git). I've also ...
2
votes
1answer
35 views

Partial or full changelog for release

When releasing a new version of a program is it better to include the full changelog since the beginning of the project or just the part since the last release? I know that the release notes would ...
1
vote
2answers
62 views

Move Files Using Git mv Or Use File System Instead

I am wondering what the difference in Git would be if I used the mv command versus moving it in Windows explorer. From Perforce I know it's important because the version system keep track of the file ...
0
votes
2answers
69 views

Should I keep looking through my git history or stop now for these CSS changes? [closed]

So I made a bunch of changes to a Rails codebase I'm working on over a period of a couple of months. Some of these commits inadvertently seem to have changed the CSS layout. The fixes themselves are ...
2
votes
2answers
56 views

Managing Similar Code On Multiple Platforms (GIT)

My team and I have developed a Chrome extension which we are now porting into Firefox. The two versions share enough of a code base that it would be redundant to manage to separate depos. In fact ...
4
votes
1answer
76 views

What is a good frequency for merging up feature branches to a main line?

We have a very large code base in mercurial. We have about a 6 month release cadence with 2 week sprints. For each release we have about 10 feature branches and maybe 5 or so people working per ...
0
votes
0answers
15 views

What is a good frequency for merging up feature branches to a main line? [duplicate]

We have a very large code base in mercurial. We have about a 6 month release cadence with 2 week sprints. For each release we have about 10 feature branches and maybe 5 or so people working per ...
0
votes
0answers
42 views

Uploading Processing Sketch with library to github

I have a sketch I wrote in the language Processing that I want to put up on GitHub. It uses a library released under LGPL so from what I understand, I'm able to (and should) upload the library ...
0
votes
2answers
124 views

Why server-side repository merge is a terrible idea in git? [closed]

Is it a good practice to do git merges on git server?
4
votes
4answers
117 views

Having a production branch or using master?

I work on small team with other remote developers on a Rails application. We are starting to modify our git workflow. We have thought about a branching structure like below: (dev) -> (qa) -> ...
1
vote
1answer
106 views

Samba/git Workflow too complicated

I'm a lead developer for a small company and I've recently came across a way to implement version control (git) on our workflow because the company is growing. In terms of infrastructure we have a ...
2
votes
1answer
101 views

Git branch usage

I'm working on a small project, and I am using Github as version control. I made a new branch to test something out, and have decided I liked the previous method better (in the master branch). What ...
10
votes
1answer
659 views

When making a fix to an earlier commit, should I rebase or add a separate fix up commit?

A common scenario in software development is code reviewing somebody else's code. A common tool for doing this is opening a Pull Request. My question is, when issues are found in the review, should ...
0
votes
0answers
50 views

Git for web development on server, with “dev” and “productive” folders [duplicate]

This question has been asked before, but none of the answers could help me in my case. I am developing a web application in PHP and JS. The workflow as it is today is the following: There are two ...
1
vote
3answers
138 views

How to version control a running web application? [duplicate]

I am developing a web application in PHP and JS. The software until recently was only being developed on and not being used by clients, so I could just change the script files directly. After the ...
4
votes
1answer
145 views

If I fork a project on Github that is licensed under MIT, how to I handle the attribution and copyright notice?

If I plan to fork an MIT project and significantly modify and rename it, how do I handle the copyright notice above the MIT license on the main License file. Would I list the original author and my ...
2
votes
1answer
64 views

Is it redundant and unnecessary to do file backups of a repository that has a remote repo?

Is it redundant and unnecessary to periodically backup the files in a Git repo, that also has a remote repo? My understanding is all repositories are full backups. So an individual developer with a ...
0
votes
1answer
50 views

Upgrading inherited 3rd party code with changes [closed]

I inherited a php project of 3rd party code with a good deal of company-specific customization lumped on top of it. Now I've got to upgrade it and the person who owned the project is the one I've ...
1
vote
1answer
67 views

How to manage legacy code in branches?

I have a website application which was developed and versioned using Git. A new version of the site was developed from the base of the older site. The 'legacy' site lives in master and the new ...
1
vote
1answer
76 views

To One Repository or Two

I have a C codebase which supports a number of build personalities, for a given board architecture. It's mostly in maintenance mode. We don't do new active development on it. We have a new board for ...
1
vote
0answers
53 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 ...
2
votes
4answers
135 views

Advice on new git / deployment workflow

I work with a small team that until recently didn't use source control. I'm working on the layout of our development/deployment workflow with git. I would appreciate and advice or insight you might ...
1
vote
1answer
43 views

Global gitignore v project [closed]

We have several web projects within our organisation - using different frameworks and with many different developers. Each developer might use a different ide and use different operating system etc ...
2
votes
0answers
95 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 ...
1
vote
1answer
100 views

forking boilerplates? or simply cloning them?

Using gitlab/github. I created boilerplates for all my projects so I've: wordpress-boilerplate html5-boilerplate laravel-boilerplate ror-boilerplate I'm debating myself if/when starting a new ...
0
votes
0answers
49 views

Keep dependencies in git repo or not? [duplicate]

Im used to composer, gems, npm and apt. So i was happy to learn in frontend we have bower now :) But do you save bower components in repistory or not? I never save composer packages in repo, to ...
1
vote
1answer
101 views

Git: Keeping track of work in progress

I'm looking for tools and/or practices and/or advice for keeping track of work in development. In an ideal world, you have a well-defined task, a bug tracker with a ticket to track your progress on ...
2
votes
2answers
75 views

Should I keep font assets in git repo?

Switched from svn to git, and I can feel that several repos with heavy assets feel, well, heavy. I never noticed this heaviness with svn. There is a huge difference when checking out whole history of ...
0
votes
1answer
35 views

git strategy on merging/rebasing feature that was abandoned but is being revived

Say we have this situation: * master | * a | * b ... a lot has happened * ... a lot has happened * z | | * aa (want to rebase onto master or merge into master but having too many ...
0
votes
1answer
75 views

Repository strategy for multiple interconnected components with small differences

At my work we have multiple products.. productA, productB, ... these products reference multiple components. componentA, componentB.. there are also shared components sharedA, sharedB... etc.. which ...
0
votes
1answer
179 views

What's the benefit of GIT for solo programmer? [duplicate]

If I am working on a program alone, I just zip entire program folder once in a while. I keep only latest 2-3 files so my disk isn't cluttered. So for example I would have 2 files: ...
2
votes
2answers
133 views

Should I backup gradle dependencies to git?

I always like to backup project dependencies myself in case they can't be resolved due to a down website or because certain versions aren't available for download any more. Should I trust the maven ...
1
vote
1answer
70 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 ...
5
votes
3answers
117 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. ...
3
votes
1answer
132 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
270 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
3answers
212 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, ...
4
votes
1answer
119 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
1answer
206 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
1answer
237 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
144 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
230 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
44 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
58 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
133 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 ...
3
votes
1answer
113 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
112 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 ...