Welcome to Software Development on Codidact!
Will you help us build our independent community of developers helping developers? We're small and trying to grow. We welcome questions about all aspects of software development, from design to code to QA and more. Got questions? Got answers? Got code you'd like someone to review? Please join us.
Posts by Michael
Passwords are annoying. Nobody really enjoys passwords, which is why "The End of Passwords" articles keep circulating. I'm looking forward to the day the prediction comes true, but in the meantime ...
The Problem The main problem is that it's important where on the commit graph your branch diverges. I'm going to make some assumptions about the circumstances that are not explicit in your questi...
There are two major sections to this answer: the Git part and the conflict resolution part. It wasn't clear at first which one was intended by the question, but both are important for a full answer...
I just realized that I started writing code for what was going to become a second independent feature on the branch I was already working on. --A--B--C main \ `Q--R--S--X--Y-...
You're right about the recalculation, as you can see from some easy experimentation by rigging two (dynamic) properties and logging what each one gives you. public long TimeStamp1 { get; } = DateT...
The answer by hkotsubo is correct. But just in case you're being very specific about fast-forwarding, it's worth stressing that you can use --ff-only as an option on the merge to abort if it requir...
Each of them has an analog to another Git command. But instead of objects in the repository, these take text file(s) created either by you or someone else. git apply Think of this as Applying a g...
As a loose follow-up to Why force designation of a remote main branch?, is there a Git-native way to configure a branch for GitHub's so-called "triangular" workflow? The triangular workflow is mea...
In the most general case[1] that you're asking about, you want the three-term rebase --onto. First, make your feature-2 branch: git switch --create feature-2 --A--B--C main \ ...
First you want to make your new branch at HEAD (current main). Then you want to point main back to origin/main. # Create new branch git branch new_branch_name # Point main back at origin git ...
This sounds to me like someone had a problem once and they've decided upon a somewhat silly way to keep that from ever happening again. The big repository hosts have a different way of addressing ...
The documentation for re.match(...) is explicit that it only matches at position 0. If you're asking this question, what you probably want is re.search(...) to match at any point within the string.
This is not exactly what you're asking for, but you could use bat, which has source code syntax highlighting and just use the raw Markdown.
Matthew's list is pretty good, although I don't think one has to do all the things on it as a "minimum." I offer one minimum and a couple nice-to-haves. Some of these I have learned as a contributo...
GitHub has a setting wherein they offer to "anonymize" your user email from, say, [email protected] to [email protected]. I presume this is to prevent you from getting spam from ...
Facing a somewhat similar situation, I took mr Tsolder's suggestion of looking into submodules. In my case, it was fine to keep the remote project as a folder in my local clone, but I think it sti...
GitHub seems to require that one of the branches on it be marked as the "primary" branch. I understand this (perhaps mistakenly) to be the origin/HEAD. Why would they make it compulsory? On forked...
I'm not exactly sure what you want with the whole of rd, but …programmatically get the name of the remote branch which my local branch is tracking… sounds very much like the @{upstream}/@{u} ...
Sylvester's answer is great, but I wanted to point out that interpolation only happens in double-quoted strings ("), not in single-quoted ones ('). If you have lines that don't need any variable o...
Is there a way to link to specific code lines for a Markdown file[1] in Bitbucket? I have found a UI toggle for each of GitHub, GitLab, and Forgejo that adds a query string to disable the pretty ou...
The documentation for /cards/search says This method is paginated, returning 175 cards at a time. Review the documentation for paginating the List type and and the Error type type to understand ...
Is there a command I can run to get the path of global gitconfig for a user? Like git config --global --edit, but I want the path, not an editor window. I want the right path whether or not this f...
I'm not sure how much this helps or inspires you, but there's an XML schema for the US Code and for bills and amendments to change it. See xml.house.gov and the GitHub repository for United States ...
Specification You understand correctly. Matrix is an interface for federated encrypted communication. From the first page of the spec: Matrix defines a set of open APIs for decentralised commun...
It doesn't change commit data when you push. You have to set your local email address to the noreply one. About commit email addresses […] If you'd like to keep your personal email address pri...
