Git is an open-source DVCS (Distributed Version Control System)
0
votes
1answer
62 views
How to deliver binaries and source to customers and developers, if both are the same?
I'm currently working on a project where i am the only developer, but it should be delivered soon to "customers". Since this is actually an application consisting of multiple libraries for physicists ...
0
votes
0answers
38 views
How to keep several Git repos in sync with upstream without complicating the UX?
For starters, we use mkdocs static site generator for managing our docs.
Some of our products share a lot of documentation. That's why it struck us a logical solution to separate out the common and ...
3
votes
3answers
132 views
Should I merge the dev branch into my user story branch?
We have a relatively simple version control process: master branch, dev (otherwise known as integration) branch, and our individual branches for every user story.
We check out from dev, branch at the ...
0
votes
2answers
116 views
Where should QA team do the testing in Gitflow branching model
We are a big team (10-12 developers and 4 qa) working on multiple projects with the same git repository. Its a spring boot based backend web service. We are looking for a good git branching and deploy ...
35
votes
5answers
4k views
Understanding the difference of branch between SVN and Git
I am a user of SVN and now I am learning Git.
In SVN I usually checkout on my local machine a repo, which includes all branches in my project and I used to select the folder for my branch I am ...
-1
votes
1answer
71 views
GitHub pull request without forking
Is it possible to submit a pull request if I originally cloned a repo locally rather than using the GitHub "fork" functionality??
The scenario is that I have created a local clone of a repository and ...
2
votes
1answer
29 views
How should Visual Studio Solutions and Projects mapped to Visual Studio Online GIT Projects and Repos?
I have a number of visual studio solutions and projects (many projects may belong to multiple solutions) that I would like to add to Visual Studio Online (GIT Version). An example would be:
Solution ...
2
votes
2answers
75 views
is there a way to know the type of web based version control application from a git url?
Background
I'm researching the ability to add some services on top of git web hosts (ie github, gitlab, bitbucket etc, I'm not even sure what they're called, I borrowed that term from the github wiki)...
3
votes
2answers
262 views
does it make sense to create a pull request without code
Background
In our start-ups documentation, we got this:
Difference between a pull request and an issue page
In a nutshell, an
issue page should only include information and discussion about ...
5
votes
1answer
113 views
How to handle version number in code, across branches?
I'm working on a PHP app, using three main branches: 'master' (current stable release), 'bugfix' (for patches) and 'next' (for next minor version).
We store the current version number in the code - ...
2
votes
1answer
34 views
Version control with delta processing uploads?
I am planning to build a version control system to learn some advanced programming concepts in the process.
I've used git , perforce and svn.
I was wondering if any of them or other uses delta ...
-2
votes
0answers
33 views
Managing Temporary Files Created by an IDE in Git [migrated]
Currently I am working in Atmel's AVR Studio 7.0 (based off of VS2015-shell) which has some funky behavior when it comes to the temporary files that get created when the IDE runs. Before going any ...
5
votes
1answer
75 views
How can I split work done in one branch without conflicts on merge?
Scenario:
I have a production (P) branch and my current (C) branch I created to work on some new features. Some of them are ready, however work on the rest will take more time than anticipated.
I ...
1
vote
1answer
74 views
Git workflow for multiple releases with external expendencies
I'm working on a project (A development accelerator) which had dependencies with a 3rd party NuGet package for a CMS application. The external NuGet package has some breaking code changes to our ...
5
votes
1answer
117 views
GitHub Flow deploy to production before merging to master: won't a second feature override the first?
In the understanding of GitHub Flow, as seen here, a feature, after code review, is first deployed to production, then merged into master.
If there is a second feature branched from the same commit ...
-4
votes
0answers
52 views
git central repository for small team with few environment?
Currently I use central repository with branch only master. with 3 people of team
So in my local computer after I finished edit and test code locally success I push to remote master, the other person ...
4
votes
1answer
74 views
Git structure on production server
So I want to add our git repo to the server so that we can pull in the latest changes from the master branch and easily update the live sites via SSH.
I don't want changes tracked by Git on the live ...
3
votes
3answers
157 views
How to restore a feature using Git?
Suppose the following scenario:
A new design for a specific page is required.
I create a new branch for that design.
I implement the design, and merge back into the master branch.
Time goes by and ...
1
vote
3answers
138 views
How should I version control my bash profile?
So I'm very comfortable with version control, and just thought to start tracking versions of my bash profile: ~/.bash_profile with the added benefit of being able to share my various aliases and such ...
1
vote
1answer
36 views
Managing Linux Kernel Config Files in Revision control
I am working on some Linux kernel drivers for a specific embedded system (NVIDIA Tegra X1). I am using the kernel source provided by NVIDIA (L4T), which has its own default kernel config files. My ...
4
votes
1answer
133 views
Should I merge all commits from an experimental branch or only the valid one?
I am new to git and trying to understand the best practices about commits and merging.
Of course you shouldn't commit buggy changes to the master branch, and from what I understand you should create ...
7
votes
1answer
211 views
Github - what is the best practice when working on open source project issues
I have solved an issue on an open project, on a dedictated fork I've made.
After that, I've committed, pushed and merged (pull request) into the main master repo.
Now I wish to work on another issue.
...
2
votes
1answer
100 views
Patch management in a multi repository environment
Here's the problem and how we currently manage this at work.
We have a buildout recipe that fetch multiple git repositories. Sometimes, it is necessary to patch a module from a repository that we don'...
4
votes
1answer
140 views
Are you supposed to commit changes to the parent when the submodules change?
I noticed some strange behavior when working with submodules in Git, which is maybe not so strange to anyone with more experience than I. Well, what I am noticing is that whenever I make changes to ...
8
votes
5answers
540 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
115 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 ...
1
vote
1answer
42 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
99 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
81 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
vote
2answers
121 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
199 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
191 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
77 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
97 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
78 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
127 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 ...
53
votes
3answers
9k 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
64 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
216 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 ...
5
votes
0answers
140 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
98 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
106 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
vote
1answer
183 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
84 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
53 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
118 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).
...
4
votes
2answers
110 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
62 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
45 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 ...
