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

learn more… | top users | synonyms

2
votes
1answer
55 views

How to handle a project in git with the same code but different templates?

I have a project where the only difference are the templates. The question is how should I manage this with git now? At the moment I have 3 different git Repos, but it's hard to maintain all 3 of ...
1
vote
1answer
59 views

What would happen if two different commits in one git repo had the same hash?

I know this has been said to be pretty much statistically impossible but that's a different question. What would be the consequences if against all odds, this did occur?
1
vote
1answer
50 views

Development Workflow (Git/CI) in varied tech level .NET Shop

tl;dr: I need a development workflow for ASP.NET apps that works for the designer on a Mac, the content writers who don't have visual studio, and the C#/.NET developers (mostly me), such that we can ...
1
vote
1answer
65 views

“Party on my branch” workflow support in mercurial

When I'm on a git project, I have a workflow that goes something like this: Start a new feature (open a new branch) Write some code, commit some code, repeat Push the code to a remote, possibly with ...
1
vote
1answer
52 views

Avoid branch conflicts/race conditions with task branches

Background Support and Sprint are the test branches for bugs and tasks Each bug gets a new branch from master, which is merged into Support, when tested good, a pull request is made between the ...
0
votes
1answer
50 views

Average commits per merge to Master using gitflow [closed]

I'm currently working alone on a project, but I still use Git since it is a really powerful tool. I use gitflow workflow methodology, and today I have merged to master with 77 commits. I was surprised ...
-1
votes
0answers
32 views

Git repo management for product with several independent modules [duplicate]

Git repo management for product with several independent modules We have a mega project with several fairly independent modules. Of these modules, 3 of them are common components, while the rest are ...
4
votes
3answers
101 views

How to maintain an unpopulated 'config' source file in git repo?

Suppose I create some widget, and decide to share it with Github. In this widget project, there's some configuration/preferences file. I need to share what the values being set are, so that if anyone ...
2
votes
2answers
82 views

Should unit tests run on every git branch?

I am new to repo management / continuous integration. I designed a repo in the following way PROJ |-src |-include |-lib |-config PROJ_Unit_Tests |-src |-config PROJ_Doc When I now do ...
2
votes
0answers
40 views

tracking branch relations with Git [closed]

here is my workflow. I have master as the most complete version of the program. If I want to add a feature I'll create a branch named with -feat as a suffix. as bugs come up, I'll create new branches ...
4
votes
1answer
43 views

Does Changing Author info in git repo affect other contributors?

After contributing some weeks I noticed that the author name in my commits were incorrect. Does changing the git history with author info in the commits create any problems for my fellow contributors? ...
27
votes
3answers
2k views

Version control practice for Rewrites

We developed a product (prototype) P_OLD in language X and we are now rewriting it from scratch as P_NEW in language Y. Since P_NEW and P_OLD are the same product: Should P_NEW just be a brach of ...
95
votes
10answers
13k views

My coworker commits and pushes without testing

When my coworker thinks that there is no need for a test on his PC, he makes changes, commits and then pushes. Then he tests on the production server and realizes that he made a mistake. It happens ...
0
votes
0answers
39 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
1answer
134 views

Git branch model critique: always derive from master

I am currently working on a large project involving at least 3 teams working on separate feature sets in the same codebase versioned on Git. Some features require back-end integration and ...
0
votes
1answer
33 views

Using sourcetree/bitbucket how can I manage multiple projects using a common codebase?

I have made a few libraries that different projects use. When I make changes to projects, I sometimes make changes to the codebase, and I want to be able to manage this all through sourcetree. So, ...
0
votes
1answer
59 views

Using open source apps source code under Apache v2 [closed]

I modified some code and added few (minor) changes to an open source Android app. Now I want to publish it on play store. The app is licensed under Apache license v2. The license file is included in ...
0
votes
1answer
43 views

git workflow: read access + pull request or write access? [closed]

Suppose there is a small team with 1 senior developer and 3 junior developers working on the same repo in a team on a github organization. The senior developer has admin access. What is the most ...
0
votes
0answers
38 views

GIT repository layout for a Solution with multiple projects [duplicate]

I was a TFS User where we had a single Solution with multiple Projects and one developer can check out his project when they need. Also the Build system can do separate build for each Project or ...
1
vote
0answers
40 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 ...
7
votes
1answer
183 views

Handling Code Signing in a Source Controlled Environment

Just a quick question, hopefully: My team maintains a piece of software that uses ClickOnce deployment and is signed with a certificate. We keep the public certificate that is actually used on a ...
3
votes
2answers
151 views

Migrating from SourceForge to Github, should I delete the SF repository entirely?

It's long overdue, but after a few too many horror stories I'm finally moving a long-running project of mine from SourceForge to GitHub. Simple question: Should I delete my SourceForge project ...
12
votes
2answers
340 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 ...
2
votes
2answers
44 views

How to handle pull requests to original repo with changes dependent on a newer version of the compiler

I have a github project that I've forked. The original repo was written for a version of OCaml before version 4.02.1. The 4.02.1 compiler gives me various deprecation warnings which I plan on fixing ...
1
vote
2answers
131 views

Git clone to memory

I'm making an app that is required to clone git repositories by a link to it and analyze the codebase. Pulling to the disk using the git clone command wouldn't scale well. Is there any way to clone ...
1
vote
1answer
44 views

How to use git for projects which has shared files

Our team uses shared folders (Windows) to work on projects together. We never make local copies, but always edit the files in-place. Now I've heard we would be much better off using git. Is git a ...
3
votes
2answers
160 views

Can I use git to replay changes for projects that use media assets rather than program source code?

So while waiting for a project to build I like to run gource and see a fun video of my team building the project over time. While I was watching me and my team fly around editing and changing the file ...
1
vote
0answers
91 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 ...
9
votes
6answers
329 views

In git, how to do versioning for a dozen libraries all worked at in parallel

We are doing projects, but we reuse a lot of code between the projects and have lots of libraries that contain our common code. As we implement new projects we find more ways to factor out common code ...
2
votes
2answers
156 views

GIT approach to starting a new project? [duplicate]

I am currently a one man development team. My boss and I use Visual Studio Online for planning out our sprints and maintaining our backlog. Where I always get stuck is how to set up the initial ...
3
votes
4answers
263 views

Why exactly is Git's pull and push approach better than Clearcase's locking and hijacking approach?

I'm trying to convince colleagues about using Git, and somehow it's hard to explain the advantage of doing a pull before a push, because just before pushing, some other developer has pushed his ...
6
votes
1answer
2k views

Should I commit regularly in new projects? [duplicate]

TL:DR; Shall I start comitting regularly small pieces of code in new projects? Even if I'm start from scratch and don't have any experience in what I'm using (framework, programming language, w/e)? ...
9
votes
1answer
226 views

What to do about large svn history when moving to git?

Edit: unlike some similar questions such as Moving a multi-GB SVN repo to Git or http://stackoverflow.com/questions/540535/managing-large-binary-files-with-git My scenario doesn't involve several ...
2
votes
2answers
134 views

Git(flow) workflow for web development

In my (small) company, we are currently thinking about dumping our current versioning system (svn) and release procedures, which are crap TBH, and switching to git. It will mainly be used for one ...
6
votes
2answers
199 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 ...
4
votes
1answer
180 views

How can I split a repository that contains many projects which share the same build system?

I've been working on the past years on a research compiler suite, which builds several executables and libraries. It has a build system (namely bootstrapper) that looks into the ./src/bin directory ...
7
votes
3answers
302 views

Reusing a merged branch, good practice?

Currently, I used to create a new branch each time I have to add a new feature to my application. When my feature is finished and functional, I merge it with the master branch. But later, when I ...
5
votes
2answers
108 views

How to incorporate a database into a branch-per-issue version control process?

We're hoping to move to a new branch-per-issue process with development. To prepare for this, a lot of research and experimenting has been happening in terms of version control, CI, and process of ...
2
votes
1answer
74 views

What's the correct commit message in a multi-project repository

Somewhere else there was a discussion on putting several projects in one large repository. My question is, how does a good commit message look in those type of repos? I usually prepend each commit ...
2
votes
1answer
62 views

Selecting members to add to a github project [closed]

My team recently added a software project to github. We are getting requests from some of the users that they would like to become part of the team. What would be a good way to choose whom to add ?
1
vote
2answers
69 views

Git Workflow for BDD?

Recently I was working with Behavior Driven Development approach in Rails using RSpec and Capybara. Everything looks okay and it even can speed up whole planning-development bridge in my work (by ...
0
votes
1answer
28 views

Making folder of a git repository a separate repository while preserving history

I have a generic git repository called Workspace and each project I have that isn't big enough to deserve its own repository is stored as a folder within it. One of my mini-projects is now big enough ...
5
votes
1answer
198 views

Avoiding the Grid of Doom™ in Git-Flow

My project follows the Git Flow branching model. Development happens on develop, which is merged into master and tagged there for releases. Hotfixes happen in branches branched off the current master. ...
1
vote
1answer
83 views

Why do I have to run git add after making changes?

I started using git when I was studying for small projects and then the workflow was git add file when having made a new file and then git commit -m ... for subsequent changes. Now I'm in a new ...
0
votes
1answer
63 views

PHP and Subversion workflow [duplicate]

I'm working on a project in a small team at the moment working on a webapp. We originally had 3 on the team with a lead dev and now we've grown to 7 and a lead dev. At the moment our workflow is ...
0
votes
2answers
80 views

Best workflow for a web development team to work on a large amount of projects simultaneously? [duplicate]

We're a team of web developers, and as the number of projects we're working on has grown and continues to, things are starting to get messy. What we currently do is work on a locally shared folder ...
-1
votes
1answer
99 views

Best practices in managing nuget repositories [closed]

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. ...
26
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
39 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
273 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 ...