Git is an open-source DVCS (Distributed Version Control System)
1
vote
2answers
67 views
In a git-pull merge, can the local branch be merged in as the second parent? [on hold]
I am looking for an option, when merging another branch into my current branch, for my branch to be the second parent of the merge, rather than the first.
Particularly, I'm looking for something I ...
2
votes
1answer
134 views
How do you use external libraries in git?
SFML, in this case, has a Git repo and a download page. Until now I have always downloaded from the download page, which came (at least for the compiler I use) with .a and .hpp files and could easily ...
3
votes
0answers
84 views
How to deal with merging of Visual Studio projects
Visual studio projects, as opposed to makefiles or other projects I know, have some quirks:
The directory structure of the project has no real connection to actual directory structure - all ...
3
votes
1answer
93 views
If I have direct commit access, is there any reason to create a pull request for a small change requiring no feedback?
At my work, we use Git as our version control system. We have a master branch, which I have direct commit access to. Sometimes I have to make a trivial fix, such as fixing a typo in documentation, and ...
1
vote
1answer
64 views
Should you include libraries and code-unrelated files in your git project and upload them to Github?
When you are working with an external library in git, should you add it to Git or should it be in gitignore? If you put it in gitignore, you run into the problem that if someone (or you yourself on ...
-1
votes
0answers
4 views
Copy all maven submodule artifacts in nexus with a classifier for branching purposes [migrated]
We have a large Maven submodule project (more than 100 submodules) which takes a while to build completely.
When a new feature is developed a feature branch is created using git and then with mvn ...
1
vote
1answer
76 views
Where does refactoring belong in GitFlow branch naming model?
I recently started working with GitFlow model as implemented by bitbucket. And there is one thing that is not completely clear to me.
We try to regularly address our technical debt by backlogging, ...
0
votes
1answer
70 views
Should adding Maven dependencies be a separate git commit?
I implemented some CSV reading functionality to my Java program, for which I required adding a Maven dependency.
Should changes to pom.xml be part of the commit for the CSV reading functionality, or ...
-1
votes
2answers
107 views
Git-like pager/editor management
A little bit of confusion over here.
I am trying to reproduce Git's behavior regarding pagers and editors (as I think Git developers already done good (maybe the best) design choices in this scope).
...
3
votes
2answers
96 views
Work with user content edits history: storing differences vs data duplication
It may not be clear so I'll develop the idea:
The point is to develop a web interface to write down notes (and anything you like), and track its evolution. My question is then: how can I store such ...
0
votes
1answer
53 views
Git extending multiple project versions
Let us say there is a project A, and i came across a project EA which extends the project.
The problem is project A is not available under version control, it is only available as tarball releases.
...
0
votes
0answers
21 views
Changes across repositories and branch names - Best Practice
I need to make some changes that are going to take place over a few repositories. When creating new branch names for each repository is it recommended to give the branches the same name in each ...
108
votes
7answers
19k views
My office wants infinite branch merges as policy; what other options do we have?
My office is trying to figure out how we handle branch splits and merges, and we've run into a big problem.
Our issue is with long-term sidebranches -- the kind where you've got a few people working ...
7
votes
2answers
212 views
Pros and cons of branching when fixing old code
Sometimes I discover that a commit I made two months ago had a bug. So I write a fix for the bug, but then I must choose one these ways of committing it:
I can commit the fix directly onto the main ...
0
votes
2answers
72 views
Migration from SVN to Git. Multiple depedant projects for Continous Integration
I'm in charge of switching our 10+ years old code base from SVN to Git. Currently we have one single monolithic repository containing all of our projects. We have shared libraries and multiple ...
0
votes
3answers
311 views
Git - Reason to forbid use of GUI Clients other than Git Bash\CMD
Is there any adequate reason for a manager to forbid the use of Git GUI Clients in a developer team.
I was talking to a friend about - let's call Foo Git GUI Client - all the features and how i was ...
0
votes
1answer
78 views
Git repo strategy enterprise web applications customers also access server
Our organization currently has several web applications running on lamp servers. They are mostly static content, but also include php via codeigniter / laravel / vanilla php.
Whenever we make changes ...
4
votes
1answer
93 views
Multiple git repositories with a common core lib
I have several git repositories for a web project that share a library of common code. I don't want to repeat the common code inside for each repo. What are some ways others have solved this problem?
...
0
votes
0answers
54 views
Having a Git repository with multiple local directories
For a web-based project I'm running an Apache server (to serve web requests) and a Java server (to serve the actual data).
The problem is that I have one folder in my Eclipse workspace where I have ...
4
votes
3answers
140 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
59 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
60 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 ...
17
votes
8answers
747 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 ...
8
votes
3answers
349 views
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
299 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
180 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
194 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
89 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....
25
votes
8answers
922 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
128 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
53 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
23 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
91 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
132 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
86 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
124 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 "...
1
vote
2answers
107 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
87 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 ...
4
votes
3answers
175 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
156 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
68 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
77 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
47 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
41 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
158 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
31 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 ...
10
votes
3answers
300 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
101 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
190 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 ...
