Tagged Questions
Git is an open-source DVCS (Distributed Version Control System)
3
votes
3answers
99 views
Do we need a separated branch for fixing bugs raised during the testing phase?
Before release a new version of the software, which is a web application, my company creates a release branch. The QA team tests that branch and reports some issues. Should developers commit the ...
4
votes
2answers
31 views
What is the right process/naming convention with GitFlow to create a subbranch of a feature branch?
I am using GitFlow for my development conventions. Generally speaking, I create a user story and an matching feature branch off my develop branch and work on that. Once the story is complete, the ...
0
votes
1answer
43 views
How to organize Git for maintaining a code base used and modified in multiple projects?
I'm trying to figure out the best use of Git for my development team. We work on multiple C projects that share some common modules, each one varying a bit in each project. A module can be a hardware ...
14
votes
8answers
492 views
Keep branches from piling up
We're beginning to run into a problem as we get bigger, where features make it to staging for testing, but by the time everything is tested and approved new features are on staging for test.
This is ...
7
votes
2answers
231 views
+100
package and version strategies in a multi repository environment
We are a small-ish firm with multiple teams who manage their own git repositories. This is a web platform and each team's artifacts are deployed at the end of the day for nightly tests. We are trying ...
0
votes
4answers
248 views
Is Git more useful for versioning binary files compared to versioning text files? [closed]
I am currently studying some basics on git Version Control System on tortoiseGit for my project management so far i know that Git keeps track of the history of changes, and allows you to easily go ...
3
votes
5answers
127 views
GitFlow branching strategy, but without the develop branch
I am thinking about adopting something like the GitFlow branching strategy. Instead of using a permanent develop branch, I would like to create a release branch for each sprint (from master) at the ...
5
votes
4answers
161 views
Best practices for dealing with projects that depend on each other in Git?
We have a product that we currently use TFS as the source control for. TFS's branching/merging capabilities seem incredibly lacking and we are migrating the project to git, and I want to take this as ...
0
votes
2answers
80 views
After a bare git repo receives a push, can it notify a remote to pull?
I have an existing git environment set up like this:
In order to deploy my changes to the production server, currently I:
run git commit on the dev copy
run git push to send my changes to project....
-3
votes
0answers
46 views
Connecting your Android app to source control?
I use Android Studio and I am wondering if there's some common practice for connecting it to some kind of source control like Git (ideally in private).
I ask because I don't want a situation to occur ...
22
votes
8answers
798 views
Git - What issues arise from working directly on master?
I have seen lots of advice about git branching models and the most common opinion seems to be that making changes directly on the master branch is a bad idea.
One of our co-workers is quite happy ...
6
votes
0answers
95 views
Keeping a clean git history when using gitflow - unmerged commits on develop
Using gitflow, when creating a release-1.0.0 branch and merging it to both master and develop, both branches will have a missing commit:
master wont have the commit where release-1.0.0 was merge to ...
1
vote
3answers
47 views
Store Nuget\NPM packages in VCS with source or not?
Is it good practice to store Nuget or NPM (or other) packages in the source control with the source, or to keep them in some other place?
My gut says they belong with the source, however a package ...
0
votes
0answers
15 views
Is there any advantages to use Integration-Manager Workflow instead of Centralized Workflow when using gitosis or gitolite
As I understand, the biggest advantage of Integration Manager Workflow versus Centralized Workflow in GIT is that only one person (integration manager) has access to the blessed repository and which ...
1
vote
1answer
87 views
How to use git when project files are on different drives?
I am new to Git, and am trying to figure out how use a git repository when a project's files are spread across different drives.
For example: The project requires html files on one drive. The CSS ...
3
votes
2answers
115 views
Best practice for git commit messages for specific modules
Our current project consists of multiple modules in /modules/. When I work on my current module and i.e. update its README how should I write a commit message for this?
Update README
Update README in ...
0
votes
2answers
81 views
Source control utilizing single, remote development server, with “local repository” not on dev's machine
We have a small team currently working on numerous projects. We originally started out as a two person team and jumped in head first without any kind of source control. We currently break numerous ...
4
votes
2answers
105 views
Long-term branch - when and how to merge it?
In my computer science capstone project, we have a team of 5 working on various things for an Android app for Pokemon as a multiplayer game (Github). One or two people are working on implementing the "...
0
votes
1answer
46 views
how to handle small change requests in the automated deployment process
I've setup a Gitlab server to manage several different Laravel Apps. I'm also able to configure the Gitlab CI to deploy the code to the development and production sites. Everything is kind of ...
2
votes
1answer
77 views
How to sync a dirty private git branch between personal workstations
I have a git repo on the internet and two workstations. Other developers have access to the git repo.
Workstation A is at the office and is not accessible from the internet, but can push/pull the git ...
2
votes
3answers
106 views
How soon can/should someone issue a pull request for a new branch?
Pull requests are a great feature of modern vcs hosting. They provide a consolidated view of everything that's happened within a branch's development, including a master diff of the composite change, ...
0
votes
1answer
76 views
What is a good format to deliver a set of versioned files to a third party?
Background: We have less than a gigabyte of documents stored in a database. In most cases there are multiple versions of a document with the same name. The versions need to be preserved.
I've been ...
6
votes
3answers
148 views
What is the “definition” of a finished feature in Gitflow?
This is a Gitflow process question. In all the documentation (and diagrams) I've read about Gitflow, they always indicate that once a feature is completed it is merged back into the develop branch.
...
1
vote
0answers
44 views
How to improve my workflow (git, symfony, composer, bower, grunt)?
It's time to improve my workflow. I never had the responsibility of setting up the infrastructure, managing git, versions or releases. For me it was simple push/pull most of the time and I think, the ...
1
vote
1answer
70 views
How to manage code experiments meant to stay permanently with git?
I have an asm/C code which implements some image filters. The objective of this project is experimentation with different implementations, benchmarking, plotting and reporting data to write a paper ...
0
votes
0answers
45 views
What is best practice for building your app on top of 'starter' code someone else prepared?
I want to build Angular2 application on top of angular2-webpack-starter. After pulling this repository, I'm going to add my own app code and commit many changes. Also, developers that built angular2-...
-1
votes
1answer
39 views
New project development & git guidlines and hints [closed]
We are two senior students and we want to develop an app.
Although we dont have experience on using git & github.
Our app will consist of a server handling requests with a mongoDB database. The ...
0
votes
0answers
69 views
VS2015 & Git Submodules
We have a few projects in my organization that are being developed in parallel and I have found that they are increasingly using similar Utility/Logging/Etc functionalities that they have as separate ...
0
votes
0answers
26 views
should I fork or branch in a use case where I and a collaborator make changes to jupyter notebooks
I was hoping on a suggestion about whether forking or branching was better for this particular use case.
I work with a professor and have created a jupyter notebook for some of our research. The ...
9
votes
3answers
287 views
github strategy for keeping one version of file private
I am a lecturer writing coding problems for students. What I want to do is give the students the boilerplate code with placeholders for the functions which students are to complete. I will give the ...
-1
votes
1answer
59 views
Ideas to improve our development and deployment process?
In the interest of continuous improvement I'm interested in finding ways to improve our software development process. There are a lot of articles out there which define a set of workflows, but all of ...
6
votes
3answers
179 views
Git philosophy: public vs. personal files: is there hybrid versionning?
I often find myself puzzled with such a questionning. I need to version my projects for two reasons:
publish source code with its whole history so that people will be able to get into it, explore it ...
2
votes
2answers
66 views
Using Pull Requests with different commits
For a new project we try to set up the development process and the intention is to have a simple, pragmatic process. We use Atlassian Stash with Git in our company.
We came up with the following ...
0
votes
1answer
47 views
How to work with starter kits and their updates?
When I start a new project based on a nice starter kit like this Angular 2 one. How do you keep up with changes to a base repo like this?
I know that it is a 'starter', but it would be nice to merge ...
1
vote
4answers
170 views
Auto-merging from master to all branches — good or bad idea?
A question has surfaced on the team: would it be a good or a bad idea to have a script auto merge from master to all this release's branches on a daily basis?
I'm not entirely convinced by it -- it ...
1
vote
2answers
68 views
Git workflow that allow new hire to work on feature without polluting git history
We want a new hire to work on some features of our current project, however, since he is a new hire, we would like to do code review before he can commit into master branch. Also, we don't want his ...
0
votes
1answer
102 views
How to manage multiple projects in a Git Monorepo
I am thinking about putting some files into a larger git respository but I have a feeling that git isn't going to be suitable.
This is what I would put into the repo:
Various scripts on servers.
...
0
votes
0answers
56 views
How does Jenkins Pretested Integration Plugin handle conflicts?
To be sure that all code is tested before it gets to master, you can set up system, for example with Jenkins Pretested Integration Plugin, that works like this: You push code to a special integration ...
4
votes
4answers
320 views
Why use pull requests instead of merging
What is the advantage of using pull requests instead of simply merging a branch into master without one? Particularly on a team where all developers have full access to master.
4
votes
2answers
480 views
Should minified CSS be stored in Git?
I use Gulp to generate minified CSS from my SASS code for a project I'm working on.
I wondered whether it's considered best practice to regenerate this minified CSS when pushing live from Git...
or
...
1
vote
0answers
84 views
How can I use local Git with VSS
My employer still uses VisualSourceSafe6. Everything is checked-in into the main project directory in VSS. They are not using branching in VSS. Check-in's are supposed to be ready for release to QA ...
4
votes
2answers
215 views
Is it important to have a consistent commit message style on a team?
On my team of 5 coders, we've traditionally adhered to a common git commit message standard stating (only) two rules: commit messages should include the why rather than just the what and they should ...
-1
votes
1answer
100 views
Version control problem
I heavily use excel and csv at my workplace.
File 0 excel file
Initial file is a excel file. Lets call thia file zero. This may or may not change with time depending upon the requirement of the ...
6
votes
1answer
61 views
Workflow for a Github fork with compatible and incompatible changes
I've forked a Github repo and added an upstream remote as described here. I expect to make some backward-compatible bug fixes for which I'd like to submit upstream pull requests, as well as some ...
0
votes
0answers
22 views
Should a test system release really be a common release in GitFlow?
We are actually releasing a version to the test system as a common release in GitFlow. We create a release branch, clean things up and merge it into master and development.
The thing is that if I ...
3
votes
2answers
120 views
Git workflow - possibly long running branches for future release
I am a member of a small team which is part of a larger team of developers working with Git. We (the larger team) have a main branch in a central repository into which we commit our work for the next ...
1
vote
1answer
134 views
Share private SSH keys with Bash on Windows
I have Windows 10 with Git installed. This Git uses my C:/Users/MyName dir as the HOME directory and the /.ssh/ dir within, appropriately for sourcing my private SSH keys.
I have just enabled and ...
2
votes
2answers
149 views
How to split development / staging / production versions of an application
I'm facing a situation that does not seem to have a clear solution to it, which leads me to believe I'm actually doing something wrong. Here I am seeking advice once again.
To rapidly let you ...
0
votes
1answer
40 views
Github workflow for public/provide codebase
I would like to develop and release and SDK in an open fashion, via GitHub.
That said, I would like to have a team of developers work on this, make commits, create issues and comments etc in a ...
0
votes
1answer
106 views
Simpler git-flow model, am I doing it right?
I'm trying to implement a branching model that is similar to git-flow, but simpler (no release or hotfix branches).
The idea is to have the master branch always up to date with the latest tagged ...
