Git is an open-source DVCS (Distributed Version Control System)
0
votes
0answers
9 views
Suggestions: Good format for short/commit messages for User Story and Sub tasks
I would like your opinion regarding a good style/format for short messages when committing into a repository (GIT or SVN).
Considering we are using a feature branch development approach, with one ...
1
vote
2answers
83 views
Is it wrong to git push force branches?
When I'm working on a feature branch, I tend to want to cleanup the commits in the branch using an interactive rebase before my work is reviewed and integrated in the main branch.
During development ...
3
votes
1answer
68 views
Best ways to manage my Git repositories with projects sharing the same code [duplicate]
My background:
I was programming for many years, but have never used a version control system. I felt, that such a system would save me a lot of time and allow me to be more productive, but I never ...
0
votes
1answer
297 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 ...
12
votes
2answers
130 views
Optimize a git repo, containing large binary files
Our project is about 11GB, 10 of which are binary data (.png images). Consequently, a git diff or git status operations take up more than a minute. Fortunately all data files are separated into a ...
0
votes
0answers
32 views
What is a good directory structure for projects with versioned code but huge data files
We work with genomics and imaging data. Our data are large, but our code is small. We sometimes work on code collaboratively, and also wish to share it with the researchers we do analysis for. We are ...
-2
votes
1answer
33 views
Handle multiple parallel wide modifications using branching in VCS
Here, the term of branch is understood as a git branch. I don't know how branch works in other VCS, but its probably VCS-agnostic.
Given a branch base, and around it many other "satellites" branches, ...
22
votes
5answers
847 views
The trend of the “develop” branch going away
I've noticed something lately looking at some popular projects on GitHub, that there's no develop branch. And in fact, the GitHub Flow guide doesn't mention it either. From my understanding, master ...
2
votes
1answer
41 views
Workflow and process when branches have dependencies in git for code reviews
A fairly common workflow for working with git is:
Fork master
Make changes/add functionality in branch
Make pull request for your branch vs master
Merge pull request (after code review, automated ...
2
votes
2answers
95 views
Docker, microservices and git workflow
We are a young company that's developing a web app in node.js with the microservice architecture.
Actual development workflow:
Each microservice is stored in a private repository
Different ...
10
votes
4answers
540 views
How to “start over” in GitHub?
I plan a complete rewrite of my project, using another framework etc. It would be nice to keep the old code including history for reference. What is the best way to do this, in order to avoid risk, ...
0
votes
1answer
48 views
Structuring git repository as a 'catch-all'
I have a really old install of Debian on my Thinkpad, and I want to refresh it now that I'm using it again. However, I have a LOT of old scripts all over this install for beauty fixes, shortcuts, and ...
0
votes
1answer
54 views
Best practices for working with public_html folders and git
Currently, everything that is in the public_html folder automatically gets published live. The git repository is also inited in this folder (though this can change if it's necessary).
What is a good ...
0
votes
2answers
94 views
Best practice for creating defined versions in git
In my company we have a 'production pipeline', which is a bunch of code which we use to produce data, with the data later shipped to customers. The code is still being developed, bugs get fixed etc.
...
4
votes
3answers
171 views
In GitHub flow, is it OK to base feature branch on another feature branch?
We use GitHub Flow in our project and most of the time, we open a new feature branch from master, do some work there, open a PR, review the code and merge back into master.
However, my current work ...
1
vote
1answer
73 views
Should we use a monorepo?
My team is planning a migration from subversion to git. We support 3 applications... 1 is primarily for internal users, 1 is for corporate "partners" and 1 is for end users. These applications share ...
3
votes
2answers
105 views
merge vs rebase pull requests on github
I am actively working on a two person project with very few longstanding feature branches (longest existing branch is 3 weeks).
I have spent the afternoon trying to understand merge vs rebase and ...
4
votes
1answer
85 views
Why use a dedicated “pushbot” user which automatically merges approved pull requests?
Most Github repositories I'm aware of use the following workflow for pull requests: one or several users with "contributor" privilege review the suggested changes and then one of them merges the pull ...
0
votes
1answer
65 views
Managing a project on github in different repos or one? [duplicate]
An app I am working on (iOS) is being distributed to different businesses and each business needs a few customizations to said app before it is distributed to users on the app store.
Most files will ...
21
votes
6answers
554 views
Splitting coding progress into meaningful commits without too much overhead
When working on a fix or a feature, I sometimes stumble over other tiny issues that can be improved on the fly in a matter of seconds. When I do them immediatly and then commit the finished ...
1
vote
2answers
49 views
Pull requests and work item linking in Visual Studio 2015 with non-TFS remote Git repo
We use TFS and Visual Studio 2015 at work but don't get full benefit from the ALM features as we have code in non-TFS Git repos.
We would like to integrate these products in with all the TFS goodies ...
1
vote
0answers
62 views
Multiple git committers on same repo and machine with forwarding agent
I have a remote machine where multiple developers work on the same repository. We use gitolite and SSH keys to manage git access.
As for now we code on the local machines, commit, push, pull remotely ...
5
votes
4answers
200 views
Is there any downside to commit messages containing the ticket number
I was wondering if it would be good practice for commit messages to contain the ticket number they were apart of. It would be like
2568 Fix heating issue
Summary of the issue with a bunch ...
0
votes
1answer
100 views
Development workflow for a team: local to live (with GIT)
We're trying to put together a workflow for Wordpress development which turns out to be pretty complicated with lots of elements. Is there a way to streamline this or filling in the gaps?
We ...
1
vote
0answers
47 views
Combining GitHub and TFS / Visual Studio Team Services
I wonder if it's possible to combine Visual Studio Team Services and/or TFS with a GitHub repository. We think both products have their own advantages and would like to work on one repo within our ...
0
votes
1answer
101 views
More than one deployable git branch
My dilemma is about the GIT flow.
Let's assume that I have an application that can be deployed differently (staging release, QA release, production release).
Since the application has profiles to be ...
0
votes
1answer
164 views
Git Bisect found the buggy commit. Now what?
I've seen blog posts explaining how to do Git bisect, but how to you fix the bug, commit again and maintain the rest of the commit history?
An actual problem I faced in my project was like this (the ...
2
votes
1answer
55 views
Isn't the master branch just a surrogate of tagging in the gitflow model?
Reading the gitflow model, it seems to me that the master branch is there only to provide a branch where to store stable versions. What does that add to just tagging develop with the stable versions?
3
votes
1answer
69 views
Do feature fixes need to be local only?
From this blog post describing the git-flow model, it seems that feature branches have to remain local to the user working on them and are actually deleted right before pushing to origin.
This kind ...
0
votes
0answers
44 views
Where do bugfixes go in the git-flow model?
In the, commonly referred to as, Git-flow model hotfixes go in their specific hotfix-* branch and small integration fixes right before release go in the release-* branch. General bugfixes from the ...
7
votes
3answers
171 views
Git branching strategy for long-running unreleased code
At our team, in addition to individual units of work (Stories), we have longer-running themes of work (Epics). Multiple stories make an epic.
Traditionally we've had feature branches for each Story, ...
2
votes
0answers
102 views
Documentation of code review
In a project we have a rather formal code review, which is currently done manually and documented in Excel sheets and Word docs.
We would like to improve the current code review process by ...
54
votes
4answers
4k views
Why does git pull perform a merge instead of a rebase by default?
Consider the following situation:
You have a clone of a git repository
You have some local commits (commits that have not yet been pushed anywhere)
The remote repository has new commits that you ...
3
votes
0answers
105 views
Is there a simpler way to help testers push code to a testing branch?
I'm a amateur programmer, I'm not used to working with Git. It's my job to help test new code, for a while now this has included pulling the branch containing the issue, merging it with the main ...
0
votes
1answer
93 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. ...
5
votes
1answer
72 views
Optimizing a file type for compare tools
Context:
I am developing a visual studio plugin that generates layer diagrams.
I want the tool to be able to produce an intermediate output, which is the data representation of what is being rendered ...
0
votes
2answers
73 views
Should I use a single repo when multiple parts of the same project are running on the same server? [duplicate]
I'm planning a project that consists of the following parts:
REST API in Lumen
Web client in Laravel
Product website in Jekyll
These separate products are going to be running on the same server.
...
5
votes
4answers
201 views
How to determine when to open a new branch or a new repository when using Git?
Currently I am working on a project to make a product for company X. The team I am working with is selling similar service to many company with similar product, where 40% of the code is reused and 60% ...
5
votes
3answers
109 views
Do we need to create local branches for the enhancements we are working on?
We just started implementing the Git source control for our project and the Admin says we should not be creating any new branches for the enhancements that we are working on instead everybody should ...
0
votes
1answer
101 views
Fork Management of Git Multi-level Hierarchies
We have the following Git hierarchy structure in place, where each child is forked from the parent. If we build something in Client1 that will be useful in the entire hierarchy, what is the best way ...
6
votes
1answer
112 views
Merge bug fixes from trunk in old branches
We are now in the process of switching from svn to git (after a year spent on convincing people, yay!) in my company.
So far, this is all for the better but there is one little thing that we ...
0
votes
2answers
75 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
2answers
191 views
If you decide that branching is a bad thing, then why use Git over SVN? [closed]
I have used Git and Mercurial a bit over the past ten years and appreciate and prefer them, but most of my experience is with SVN. If it is decided within a corporate programming group that branching ...
0
votes
0answers
42 views
Workflow for maintaining a partially diverged fork
I work on a code base where I maintain a fork that is diverged from the upstream slightly. The project is about 5 million lines, and in general the developers and the users of a the code are the same ...
3
votes
0answers
319 views
Keeping a permanent git fork updated [closed]
Please consider the following scenario:
There is an npm package named some-package.
There are a couple dozen known dependent npm packages that all depend on some-package.
I forked some-package and ...
6
votes
2answers
403 views
Should collaborators on a private Github repository each fork the repo?
I'm working on a project at the moment, and we have the source code up in a private repository on Github, with each of us as a collaborator.
What we are unclear on is how to separate each of our ...
1
vote
2answers
104 views
How to make git automatically merge increased build numbers? [closed]
I like having build numbers, just because it is cool. Please don't judge me :D.
However, I develop on two machines (one OS X and one Windows for portability checks). I have on both machines a script ...
11
votes
2answers
258 views
Workflow, editing things not in your current task
Usually when I program, I have a clear task ahead of me, but find annoying things I'd like to clean up as I go on.
Here I see three options:
Do it later (may forgot/have to spend time adding a ...
1
vote
2answers
460 views
Making major version step in software development in separate repository [duplicate]
Currently we are planning to switch from our software version 5.x.x to 6.x.x. Such major releases contains in our case a lot of refactoring work and changing the software architecture. Instead of ...
4
votes
0answers
61 views
Restructuring SVN repo for migrating to git [duplicate]
We currently have a SVN repo structured like so
/trunk/library/libA
/libB
/libC
.
.
/trunk/tools/toolA
/toolB
.
...
