Git is an open-source DVCS (Distributed Version Control System)
0
votes
1answer
25 views
Etiquette for reverting others' work
Recently I've had an argument with a teammate that I was "not consulting them before reverting" because it makes them "look like an idiot". (For context, this is a university project, and the revert ...
1
vote
2answers
86 views
One huge git repository: How to handle releases and branching?
Imagine the following git repository:
/
/ProductA/product_a_main.py
/ProductB/product_b_main.py
/SharedLibrary/shared_library.py
SharedLibrary is used by both ProductA and ProductB.
ProductA and ...
0
votes
1answer
29 views
How can I holistically manage a multi module multi repository application
I am writing an application that I've split into multiple jars including re-usable infrastructure libraries, each has their own versions (BOM managed) and git repositories. I'm doing this for a number ...
3
votes
2answers
90 views
Vendoring part of my repository in someone else's project
I have a repository for a project that contains both an executable and a library.
My repo
|->src
|->my-exe
|->my-lib
I am now working with a company that wants to use my library in ...
0
votes
1answer
66 views
Introducing version control with a simple pull request workflow
I have very little experience of using a version control system and my work colleagues have no experience though I would like to introduce one into our team as the current workflow (non-existent ...
-1
votes
0answers
48 views
Bitbucket's pull request merge vs git flow feature finish
Using git flow, one first starts working on the feature by
git flow feature start
When it is ready, one makes it available for others to checkout by
git flow feature publish
One makes a pull ...
1
vote
2answers
103 views
How to work on git local branch, using pull to update but without push
I am working on a local copy of a large project on github. Most of the changes I make are modifications to tailor the application for a speific use case, as such they are not going to be accepted by ...
1
vote
5answers
186 views
Is consequent and efficient refactoring enemy of code reviews in a legacy code context?
There are some Tech Leads that perform code reviews for each Git pull request.
Apparently, a very good practice to be aware of the evolution of code.
Basically, they expect to inspect a few lines of ...
-2
votes
1answer
39 views
Reference state of git repo on a per-commit basis
Not being an advanced git user I apologize if this is a trivial question. I could not find an answer for it elsewhere on StackExchange unfortunately. Cutting to the chase...
Is it possible to ...
2
votes
1answer
183 views
How do I write a message for a commit that resolves a merge conflict? [closed]
Say you commit, pull, have a conflict, resolve the conflict, and then commit. Since the local change already has a commit with a meaningful message and the remote change being pulled has its ...
1
vote
1answer
56 views
Git - how to have mixed permissions for merging a pull request into a protected branch?
I know that, on github, you can define a protected branch and allow only certain users to merge a pull request there.
Say, for instance, that users A, B, C and D are developers and A is team leader ...
1
vote
2answers
89 views
How I can organise a project in more programming languages in Git repos? [closed]
At work I'm using Java, but I'm planning to study some other programming languages as Python or Clojure.
I'm thinking of coding one project in Java in my Git repository and, during my study, coding ...
1
vote
2answers
76 views
What's the canonical method to add in changes from the original source of a forked Git repo?
For simplicity's sake, let's say I'm maintaining a fork of Bootstrap. My changes are specific to my theme, so they'll never be merged back into the original Bootstrap project, but I still want to make ...
4
votes
1answer
79 views
Is it a good idea to manage a group of repo microservices as submodules of a master repo?
At the moment of writing I have let's say 4 micro services interoperating in order to build a bigger system.
Every microservice has its own repo.
What I'm thinking is that it would be useful to have ...
52
votes
3answers
8k views
If GitHub interacts with Git, and Git is licensed under GPLv2, shouldn't GitHub be open source?
Since Git is licensed under GPLv2, and, to my understanding, GitHub interacts with Git, shouldn't the whole GitHub codebase be open-sourced in a GPL-compatible license?
-1
votes
1answer
55 views
Collaborating on a visual studio project
In our company I started to develop an ADDIN for a drawing application. The first results of this ADDIN were reviewed as successful by the direction and they want to increase the workload on the ...
2
votes
1answer
176 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
97 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
95 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
73 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
84 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
74 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
vote
0answers
51 views
How to remove and archive source code in a git project so it can be found
I'm working on a project where requirements are rapidly changing, therefore some functionality is built then rapidly replaced by other functionality. I'd like to remove some functionality from the ...
-1
votes
2answers
110 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
99 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
55 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
29 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
219 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
76 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
315 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
96 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
55 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
151 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
73 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
66 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
757 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
360 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
315 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
211 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
207 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
96 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
926 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
130 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
54 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
25 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
92 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
150 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 ...
