327
votes
Accepted
Maintain hundreds of customized branches over master branch
You are completely abusing branches! You should have the customisation powered by flexibility in your application, not flexibility in your version control (which, as you have discovered, is not ...
- 8,765
182
votes
Accepted
Should I submit a pull request to correct minor typos in a Readme file?
Just fix all the typos you noticed and create a pull request with a comment along the lines of 'Fix typos'. Then it's one button to click for a person with the correct access.
You don't need to ...
- 1,700
110
votes
Accepted
If GitHub interacts with Git, and Git is licensed under GPLv2, shouldn't GitHub be open source?
3 reasons why:
According to the terms of the GPL, people accessing GitHub via the web is not considered releasing (or propagating in GPLv3 terms), and so GitHub is not required to share their source ...
- 27.7k
95
votes
Maintain hundreds of customized branches over master branch
Having 500 clients is a nice problem, if you had spent the time up front to avoid this problem with branches, you may never have been able to remain trading for long enough to get any clients.
...
- 4,604
83
votes
Should images be stored in a git repository?
This question is pretty old but this is a common question that comes up when dealing with Git and there has some progress on modern solutions to storing large files in a Git repo since the last answer....
- 1,048
82
votes
Accepted
Should I keep my GitHub forked repositories around forever?
Updated answer:
As of February 18, 2021, the “Unknown Repository” issue has been resolved. You should be ok to delete repositories once all the branches have been merged.
Old answer:
Deleting forked ...
- 1,284
82
votes
Accepted
In code review, should I ask to do a refactor outside of the scope in a pull request?
There are several relevant trade-offs here:
Review complexity. If a branch has more than one functional change commit or more than one refactoring commit it becomes time-consuming to review the ...
- 11.3k
76
votes
Accepted
The trend of the "develop" branch going away
It comes from the CI mindset where there is integration several times a day.
There are pros and cons of both.
On our team we have abandoned the develop branch as well since we felt it provided no ...
- 5,108
75
votes
Accepted
Understanding the difference of branch between SVN and Git
I am a user of SVN and now I am learning GIT.
Welcome to the gang!
SVN Re-education
In SVN I usually [...]
Hold on for a moment. While CVS and SVN and other traditional (i.e. centralized) version ...
- 784
73
votes
Accepted
What is the best way to code review a work-in-progress?
GitHub allows for PR to be in a "draft" state. Your team can see the differences, and even comment on it, but it's still obviously a work-in-progress, and cannot be merged until you click a &...
55
votes
Should I submit a pull request to correct minor typos in a Readme file?
Some context that may or may not be relevant.
A cloud hosting provider named DigitalOcean hosts an event every year called Hacktoberfest to encourage people to contribute to open source projects in ...
- 1,598
47
votes
In GitHub flow, is it OK to base feature branch on another feature branch?
Here is the workflow that I follow when I branch from a feature branch:
Create feature-branch-B from feature-branch-A
Work on feature-branch-B
If more commits are added to feature-branch-A after ...
- 571
42
votes
Accepted
Is it better to start a Pull Request or perform a local merge commit on master?
git-merge mechanism:
Using git merge feature while on master merges the branch feature to master and produces a merge-commit (if the branch cannot be fast-forwarded) in the git history. To force a ...
- 989
40
votes
Maintain hundreds of customized branches over master branch
In the future, ask the Joel test questions in your interview. You'd be more likely not to walk into a trainwreck.
This is an, ah, how shall we say... really, really bad problem to have. The "interest ...
- 12.1k
38
votes
Why squash git commits for pull requests?
The main reason from what I can see is as follows:
The GitHub UI for merging pull requests currently (Oct 2015) does not allow you to edit the first line of the commit message, forcing it to be Merge ...
- 481
37
votes
The trend of the "develop" branch going away
There are two philosophies I've seen in projects, and I think the choice is just a matter of taste:
Designate 'master' as the production release and develop in a 'develop' branch.
Develop in 'master' ...
- 541
32
votes
The trend of the "develop" branch going away
A develop branch matters more if your process to release is complex and you need to have serious release-candidates.
For example, imagine you are writing software which is firmware on cars. This is......
- 12.1k
31
votes
Understanding the difference of branch between SVN and 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 interested to and work there.
Unless you check out ...
- 11.3k
29
votes
Accepted
Should I use git stash to save ongoing changes of my project and push it to github to access in other computers?
I've simply committed unfinished (and messy) states of my code before (and pushed it) only for the purpose of pulling that in the other computer to continue the work. I am pretty sure this a bad ...
- 34.6k
28
votes
Declaring multiple licences in a GitHub project
You can use any mechanism to include those licenses that you like, as long as it becomes clear to a visitor of your project which license is applicable to which portion of the project.
My preference ...
- 73.2k
28
votes
In code review, should I ask to do a refactor outside of the scope in a pull request?
Just nitpicking, but usually I try to do the refactor before the change:
Commit 1: Refactored class hierarchy in preparation for feature XY-123
Commit 2: Implemented feature XY-123
Another one I ...
- 289
26
votes
Declaring multiple licences in a GitHub project
In a presentation of the SPDX creators (slide 12), it is very clear:
Contents of LICENSE:
Apache-2.0 OR GPL-2.0-or-later
You could add two additional LICENSE files then: LICENSE.Apache-2.0 and ...
- 537
25
votes
Accepted
Why popular repositories use release version as a "Release title" in GitHub?
How to manage release with Git and GitHub ?
The Git standard way of identifying a release is to create a version tag. This tag marks a specific version of your software in the change history of your ...
- 75.9k
24
votes
Pull request merge process requiring rebase after every commit merged into master?
The core issue here is that your CI process takes hours. Everything else is standard good practice as far as many companies/developers are concerned.
The reason to always expect a feature branch to be ...
- 47.6k
23
votes
How to ensure that developers see only the project modules they are working on?
Why you shouldn't do it from a team perspective
The most important rules of project management regarding teams are:
The project can be a success only through intense teamwork.
Empowered teams that ...
- 75.9k
17
votes
Maintain hundreds of customized branches over master branch
This is one of the worst anti-patterns you can hit with any VCS.
The correct approach here is to turn the custom code into something driven by configuration, and then each customer can have their own ...
- 8,097
16
votes
Accepted
How to "start over" in GitHub?
I vote for keeping everything in a single repository.
I would:
Create a new branch to point to your old code
Delete all the code and commit on master
Start your rewrite on master.
This is how:
...
- 859
16
votes
Accepted
How do we avoid development files in the release?
When we make a release, that release contains not only the actual release files but also contains all the meta and testing stuff. This happens because GitHub's way of creating releases is to simply ...
16
votes
In code review, should I ask to do a refactor outside of the scope in a pull request?
For me, it depends on if the main change is difficult to follow without the refactor. If it is difficult to follow, I'll ask for the refactor to be done as part of the pull request, in the interest of ...
- 147k
15
votes
The trend of the "develop" branch going away
If developers are working on feature branches, and then merging those into master when they're done, that means there's a period of time where features/fixes are being merged into master and the ...
- 5,656
Only top scored, non community-wiki answers of a minimum length are eligible