What was causing the problem? Enumerables! Take a look at the EDIT section in my question for the solution. EDIT: posting the updated code here as answer. The problem was in the way I used enumerables. Bottom line is you should never trust lazy loading when you need consistent results right away. public class Request … Read more
Vi is giving you a hint about “properly” formatting your commit message. While there is no specific enforcement of one message style w.r.t. another, “traditionally” Git commit messages are structured this way: A short title describing the changeset (usually less than 50-60 characters); One blank line; A more complete description of the commit, optionally divided … Read more
You have a very clear explanation of how this works in the chapter on Acenstry References in Pro Git: ~ is used to get the first parent. ^ can be used to get the other parents (^2, for example, for a merge). But you don’t have a simple way to reference the next commit, even … Read more
Use the –date option when you commit: git commit –date “Wed Feb 16 14:00 2037 +0100” Here are the supported date formats: https://git-scm.com/docs/git-commit#_date_formats
How tags work In git, each tag is said to “point to” a (one, single) commit. In fact, the same is true of a branch: a branch name also just points to one commit. What makes this work is two things: each commit also points to another commit (or perhaps several), and for branches (and … Read more
Updated answer: My original version of the script below was flawed in the sense that $conflicting_files in fact did not contain only the files that really had conflicts, but all files that were changed in both parent branches (but not necessarily had conflicts). Also, it was not using “the configured merge tool” as advertized in … Read more
You can click on the Insights tab (next to Issues and Pull requests) and you will see a sidebar on the left. Then click on Network. You will see the most active forks there. For example: https://github.com/cyverse/clank/network
You have to explicitly stage changes for commitment by using git add or git rm. If you use the -a flag when doing a commit, git will automatically stage any modified and removed files without you having to explicitly stage them using add or rm, etc. If you don’t specify -a, any files that have … Read more
If you are changing the code file, I don’t really see why you wouldn’t want to commit and share those changes. If you don’t you run the risk that someone else will fix them and then collide with yours. If they aren’t changes that other users want in the codebase, perhaps you should ask yourself … Read more
Not a direct answer: consider using repos instead of branches for this. Imagine three repos: local, dev, and blessed. Local = your own repo where you work. Dev = the repo you push all your commits to and the one that your build process is monitoring for changes. Blessed = the repo that only the … Read more