Tag Info

Hot answers tagged

26

If you want to message them via GitHub, why not use Mention Notifications? Open an issue on your own repository and mention the forker in that issue. The issue should be relevant to the stuff you want to pull, so you can discuss the pull request they need to send. Something like "@JohnSmith has already implemented this feature - can you please make a pull ...


11

Did they ask you if it was OK to fork in the first place? No, because it's open source. I'd say you can take their changes as long as you abide by the licencing terms without having to worry whether their (sorry, your) open source project code is open source. If they didn't want you to take the changes, they wouldn't release them as open source (though, ...


6

open a single pull request for a larger quantum of work, such as [...] a user story? That's what you should do. Two reasons: There is a mantra that one should "commit early and often". Once you get used to it, you will recognize that this is a good habit. The side effect of it is, that you will produce a larger number of commits, which you may or ...


5

Having a branch per customer is not an ideal solution, for a couple of reasons: It doesn't scale well. You will have to create a new branch for each customer, and then manage merging code changes between all those branches. And, when you actually do need a branch for a legitimate reason (feature branch, production fix, etc.), you'll have to branch all ...


3

First of all, as you already pointed out, they require less work. In my opinion, the burden is on the process that requires more work—in this case the rebase process—to prove its superior utility. The biggest argument is that merges preserve an accurate history, as the development actually happened. A linear, consolidated history is useful at ...


2

In general, I don't bother looking at the network of people who forked my repositories. If they want to commit the changes upstream, they'll send me a PR and we'll start a dialogue in that thread. It gets too cumbersome to track people down and ask them for a PR otherwise.


2

It's part of your private environment. Most people want; some random tool like guard is not something I know or care about, nor want to use if for some reason it managed to be installed. I build projects by typing make, not automatically in the background. However, I disagree that privately useful files should never be part of the repo. Many projects ship a ...


2

If you put a private key it git, it is no longer private. If you don't mind that happening, then do it. If you want to keep the private key private, don't publish it on a public server. Instead, check in to git instructions on how someone can generate and use their own private key.


2

No it should not. A key has different specifications to source code or program. The product should not work without a key It is specification of product that it does not work without a key. If you include the key in the distribution you effectively destroy its use. A key should be easily replaceable. In fact, sometimes it's needed to regularly replace ...


2

In my opinion, this would depend on how much they are actually coupled. It is really nice to be able to run an automated git bisect when tracking down a regression, but this will be difficult to do if every commit depends on a different version of your other dependencies to run. Two possible options would be one repository with submodules or multiple ...


1

There is absolutely no reason to avoid git submodule; it works far better than most of the alternative "solutions". Just have your build script assert (but not modify; to solve problem 1) that the submodule is present and up-to-date (solves problem 3), and only make changes to the submodule as its own repo, not as if it's part of the main repo (solves ...


1

As always, this is a non-obvious question only because there are several valid principles in conflict. The one is that you should version-control everything that is needed to build the project. This is rather important. The other is that secret information should be passed out on a need-to-know basis to minimize the probability of data breaches. This can be ...


1

Some terminology may help you understand. Note that I am significantly simplifying; use this to help figure out what things are, not what they are not. A blob is like the contents of some file. It has no name, and is immutable. A tree is like the contents of some directory. It contains other trees and blobs, and gives them names. It has no name of its own, ...



Only top voted, non community-wiki answers of a minimum length are eligible