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

learn more… | top users | synonyms

0
votes
8answers
552 views

Applying commits into another branch without merging

I have two git branches with almost the same code, but some minor changes in order to support different platforms. I need to maintain these changes because I need them to run the software on ...
0
votes
1answer
178 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
103 views

git clone vs cp -R

I want to use an existing project as a starting point for a new project by copying or cloning it. There are at least two ways of doing this. Method 1: Copy it. cp -R /path/to/source /path/to/dest ...
0
votes
2answers
128 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
303 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: test-project-2015-...
0
votes
2answers
1k views

Correct way to undo the past few git commits including a merge? [closed]

My team is working with git for the first time and has really messed up our git remote due to our inexperience. I'm trying to help educate them on git to solve the problem in the long term, but in the ...
0
votes
2answers
82 views

Is it better to start a Pull Request or perform a local merge commit on master?

I have been using GitHub for quite some time now and I usually used to push my feature-branches and then start a Pull Request which I myself merged. I found it helped me keep track of where I merged ...
0
votes
1answer
768 views

Git structure for java project

I know there are multiple posts on similar problems, so please be kind with me. I am asking for suggestions I have not thought of and for good advice. I have a java "project" that is structured in a ...
0
votes
3answers
250 views

How come centralized source control solutions don't do branching in place

With centralized source control like Perforce and SVN, when they create a branch, they create a whole new directory. However, git and other distributed source control solutions, in my experience, are ...
0
votes
2answers
64 views

Should I use branches for example uses of a github repo?

I'm working on a Github repo called Designemplate at https://github.com/benwatkinsart/Designemplate and was thinking of developing some example uses of the CSS file to show how it's used. Should I use ...
0
votes
2answers
574 views

Script/tool to import series of snapshots, each being a new edition, into GIT, populating source tree? [closed]

I've developed code locally and taken a fairly regular snapshot whenever I reach a significant point in development, e.g. a working build. So I have a long-ish list of about 40 folders, each folder ...
0
votes
1answer
88 views

Development environment for lots of websites with Git

I have 5 different websites that use exactly the same code, apart from they have an uploads folder with different contents (AKA images that aren't consistent through every site) and also a config file ...
0
votes
1answer
63 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 ...
0
votes
1answer
127 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 ...
0
votes
3answers
181 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 ...
0
votes
3answers
237 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 ...
0
votes
2answers
290 views

Why are these seemingly unnecessary merges happening in git?

Consider this screenshot from our development repository: We are relatively new to git, so things are still somewhat confusing. The question at hand: If you take a look at the commits by me at the ...
0
votes
1answer
358 views

Strategy for maintaining offline repository safely using git [closed]

I use git for versioning. Just yesterday I was working on refactoring my Python code base. After adding a test I found that I had introduced a bug in one of project euler solutions. So I checked out a ...
0
votes
4answers
4k views

Searching in a repository

I'm very new to source control management and one thing puzzles me: is it possible to search through the whole repository for a string? For example I'm tracking one file, which has 100 commits and I ...
0
votes
2answers
1k views

New vs Clone Git in Eclipse with EGit

I'm not sure I have either my new repo or clone repo workflow, or both, setup correctly. When I create a new project I create a repo on github, can't clone from it as it's empty so I create a new ...
0
votes
1answer
119 views

An elegant way to store build counter [closed]

We use Git and Jenkins as our build&release system and each build is assigned a version number which looks like this: 6.0.12345. Here, the 12345 part is a counter which increments with each build. ...
0
votes
1answer
120 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
78 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
1answer
56 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 ...
0
votes
1answer
61 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
188 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
2answers
309 views

How to best structure Git for our team [closed]

We're starting to develop many small web projects in our company, where mostly they will have one shared resource with some code pieces (SDKs, utilities and etc...) Our team is small (~5) but is ...
0
votes
1answer
972 views

In Git, is the use of a 'PRODUCTION' branch necessary and/or would it be feasible to have more than one of them?

A short summary of how we do branch managing: From the MASTER branch one or many feature branches can be made (for mid to long term development), when deploy-able changes have been merged to MASTER ...
0
votes
1answer
143 views

How do I properly add a reference from my Github project to someone elses in VS2013 on Windows 8?

I need to reference the latest version of Bouncy Castle in a project I intend to publish to Github. In my first posting of the code to Github, someone complained that I downloaded the entire Bouncy ...
0
votes
2answers
260 views

Git temporary code-change

My program interacts with another application via a socket communication. The current public version of this application does not support a specific command while the newest trunk does. To be ...
0
votes
2answers
296 views

Github Workflow: Pushing small fix branches to remote, or keep them local?

In Scott Chacon's workflow (explained eg in this SO answer), with essentially two silos (development, and master), if, say I have a small bug to fix (e.g. can be fixed with a few characters) is the ...
0
votes
1answer
744 views

Why does Aptana need Git installed on Windows?

Why does Aptana Studio need Git installed on Windows?
0
votes
1answer
64 views

GitFlow, should my release branch include minor version number?

I've found it difficult to find a definitive answer to this question. Using Semantic Versioning and GitFlow should my release branch include the minor version number? I'm not referring to tags. My ...
0
votes
1answer
401 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 ...
0
votes
1answer
77 views

Will changing published git history on a private repo cause problems when I make it public?

I have a github repo that is currently set to private. I'd like to make it public but before doing so would like to clean it up a little bit by squashing some commits and possibly rebasing so that the ...
0
votes
2answers
237 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 ...
0
votes
1answer
143 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
1answer
313 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
3answers
110 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 ...
0
votes
1answer
193 views

using pre-commit / post-merge hook script to replace configuration values

I'm having some problem developing a web application with various developers, each one has an specific configuration to work. and i would like to use the less resource cosuming approach to avoid that ...
0
votes
2answers
117 views

Distributing a data access solution across multiple solutions

I have 3 solutions, one of them is a dataccess solution with all the repositories etc. At the moment when a change is made to it, the others have to go get the latest nuget version locally, we have a ...
0
votes
1answer
159 views

External repository moved from Sourceforge (SVN) to GitHub, now what?

We've been getting the head revision of the JEDI Code library for a while, we only use it a tiny bit so never have bothered to manage which version we're getting. The problem is they appear to be ...
0
votes
2answers
148 views

How do I share different files in a git repo with different people?

In a single directory with a Git root folder, I have a bunch of files. I am working on one of those files, X.py, with my friend Alice. The other files I am working on with other people. I want Alice (...
0
votes
0answers
20 views

Is there a way to group branches from separate Git repositories [using Visual Studio]?

At my job we are migrating from TFS to VSTS Git, though the VCS types probably don't really matter as much as how we're using them. We use VS2015 for development usually, in case that matters. The ...
0
votes
0answers
29 views

GIT - where/how do I save my Private SSH keys? [migrated]

I'm using Git, I want to have multiple keys. I'm reading I should use ssh/.config. The first thing I need to include is where to find the SSH key. Where do I save it? Do I just create a .txt file ...
0
votes
0answers
41 views

I've used Git with Github, but now I need to use it with something else. How can I add another SSH key? [migrated]

Sorry if this is not the right stackexchange. I have used Git with Github and that works well. I now want to use Git with my own website which is on a live site. My host provided me with an SSH ...
0
votes
0answers
47 views

Which git branches should I tag?

I read this nice post: Git branching and tagging best practices I really like the NVIE git branching model and I try to use something very similar: http://nvie.com/posts/a-successful-git-branching-...
0
votes
0answers
87 views

Is updating a remote-tracking branch by local branch a good practice?

In Pro Git you can see: Remote-tracking branches are references to the state of remote branches. They’re local references that you can’t move; they’re moved automatically for you whenever you ...
0
votes
0answers
34 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 upstream/...
0
votes
1answer
30 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 ...