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.
Activity for Michaelâ€
Type | On... | Excerpt | Status | Date |
---|---|---|---|---|
Answer | — |
A: After git fetch, how to fast forward my branch? 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 requires a merge commit. ```sh git merge --ff-only origin/branchname ``` Where is this useful? I hav... (more) |
— | 8 months ago |
Edit | Post #292163 | Initial revision | — | 8 months ago |
Answer | — |
A: How to establish a relationship between HTML elements (tags)? (i.e., how can one element refer to another one) 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 Legislative Markup. They may already have XSLT transformations to HTML for current-version and/or diff m... (more) |
— | 8 months ago |
Comment | Post #292135 |
> Git is specifically a versioning system for code repositories, so it 100% belongs on Software Development.
Agreed
> Git questions should all be banned for every community other than this one,
Meh. I think that's a little too far, but if there's broad consensus I'll take that into considera... (more) |
— | 8 months ago |
Suggested Edit | Post #292082 |
Suggested edit: Grammar (more) |
helpful | 9 months ago |
Comment | Post #291978 |
Apparently, there is [already a project](https://github.com/spyder-ide/pysyntect) for Syntect bindings in Python. (more) |
— | 9 months ago |
Edit | Post #291970 |
Post edited: Nest the workflow summary |
— | 9 months ago |
Edit | Post #291970 |
Post edited: Downgrade headings to reserve h1 for system use |
— | 9 months ago |
Edit | Post #290587 |
Post edited: Downgrade headings to reserve h1 for system use |
— | 9 months ago |
Edit | Post #290490 |
Post edited: Downgrade headings to reserve h1 for system use. |
— | 9 months ago |
Comment | Post #291970 |
I'll give you that squashing is optional, but it's important if you make use of ReReRe, so that the pre-image and merge outcome are bound together. Otherwise, you have to do all those fixups again. (more) |
— | 9 months ago |
Comment | Post #291978 |
That I do not know. You should be able to make Python bindings for a Rust project with [`py03`](https://github.com/PyO3/pyo3), but I haven't done this, and I don't know whether streaming would work there... (more) |
— | 9 months ago |
Edit | Post #291970 |
Post edited: Rebase docs links |
— | 9 months ago |
Edit | Post #291970 |
Post edited: Rectify commit SHA. Mention `squash` alternative. |
— | 9 months ago |
Edit | Post #291970 |
Post edited: --rebase-merges and summary section |
— | 9 months ago |
Edit | Post #291970 |
Post edited: Link sources. |
— | 9 months ago |
Comment | Post #291977 |
I don't actually use `bat` very much, but I use [`delta`](https://github.com/dandavison/delta) for syntax-highlighting diff contents in the terminal pretty much every day. They use the same syntax highlighting library. (more) |
— | 9 months ago |
Edit | Post #291978 | Initial revision | — | 9 months ago |
Answer | — |
A: Can you have syntax highlighting for streaming text in Python? Does `bat` work for this, as well as for your other question? I see you have tagged your question as Python, but I'm not sure I understand how it's relevant. Sources: this issue comment and also that one. (more) |
— | 9 months ago |
Edit | Post #291977 | Initial revision | — | 9 months ago |
Answer | — |
A: How to format Markdown in terminal 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. ![Screenshot][] (more) |
— | 9 months ago |
Edit | Post #291970 |
Post edited: Sample interactive rebase |
— | 9 months ago |
Comment | Post #291972 |
> That, and `--interactive` is very nice on the rare occasions that justify it for me.
I mostly use a local GUI for that now, but I did a lot of `rebase -i HEAD^^^` stuff in the past.
> I really wish all these GitHubs would add an interactive rebase UI for the PRs, it would be so useful.
The... (more) |
— | 9 months ago |
Edit | Post #291970 |
Post edited: CLI cleanup |
— | 9 months ago |
Comment | Post #291972 |
The three-argument `git rebase --onto` changed my life. I still have to look up how to do it every time, but moving an accidental _second_ feature branch back onto `main` has been transformational. (more) |
— | 9 months ago |
Edit | Post #291970 |
Post edited: Expand on interactive rebase. |
— | 9 months ago |
Edit | Post #291970 |
Post edited: Add commands, as requested. |
— | 9 months ago |
Edit | Post #291970 |
Post edited: |
— | 9 months ago |
Edit | Post #291970 |
Post edited: Fix non-word-breaking "/" |
— | 9 months ago |
Edit | Post #291970 |
Post edited: Huge section on Merge Tools |
— | 9 months ago |
Edit | Post #291970 |
Post edited: Numbered substeps. |
— | 9 months ago |
Edit | Post #291970 |
Post edited: Split up a multistep item |
— | 9 months ago |
Edit | Post #291970 | Initial revision | — | 9 months ago |
Answer | — |
A: What is the general process for merging two git branches, reviewing edits on each branch? 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. Git workflow Workflow summary 1. Make a temporary branch in case things go badly. 2. Start t... (more) |
— | 9 months ago |
Edit | Post #291928 |
Post edited: Un-prettyprint the error message. |
— | 9 months ago |
Comment | Post #291928 |
I can't find any evidence of the link you refer to by TemporalWolf on "Bare exceptions." Maybe edit it in? (more) |
— | 9 months ago |
Suggested Edit | Post #291928 |
Suggested edit: Un-prettyprint the error message. (more) |
helpful | 9 months ago |
Edit | Post #291349 |
Post edited: Fix typo. Markdown headings. |
— | 10 months ago |
Suggested Edit | Post #291349 |
Suggested edit: Fix typo. Markdown headings. (more) |
helpful | 10 months ago |
Comment | Post #291704 |
Not "the" answer, just a comment: I think some locales actually use a `'` as the digit separator (Switzerland? others?), whereas to my knowledge, none use an underscore. The other ones I know of (space, `,`, `.`) are already taken by other syntactic meaning. Also, some of them are different in differ... (more) |
— | 10 months ago |
Edit | Post #291667 |
Post edited: Markdown formatting. |
— | 10 months ago |
Suggested Edit | Post #291667 |
Suggested edit: Markdown formatting. (more) |
helpful | 10 months ago |
Comment | Post #291667 |
Are you sure `HOME_DIRECTORY` is a string? It could be a class where the `/` operator is set up to do something cute with `__truediv__()`. If I had to guess, it's probably returning that same object type, but with the second operand appended to the path. (more) |
— | 10 months ago |
Edit | Post #291535 |
Post edited: Mention marking extraneous whitespace. |
— | 10 months ago |
Edit | Post #291535 |
Post edited: Link the discovery in the comment thread. |
— | 10 months ago |
Comment | Post #291533 |
Nice. Maybe write up a self-answer, so it's not buried in a comment thread? (more) |
— | 10 months ago |
Comment | Post #291533 |
`vim /usr/share/vim/vim90/syntax/markdown.vim`? I poked around at the `skipwhite` entries, but none them jumped out as suspicious. (more) |
— | 10 months ago |
Edit | Post #291535 | Initial revision | — | 10 months ago |
Answer | — |
A: Syntax match any 2 spaces at end of line You could explicitly match the other whitespace, too, to see if that gets around an existing rule.[^default] Here are two ways to do that:[^magic] Match the other whitespace in another rule You could use a `\@=` lookahead to match all the whitespace before your special rule. This might cajole y... (more) |
— | 10 months ago |
Edit | Post #291533 |
Post edited: Fix typo. Block quotes in case we get viml syntax highlighting sometime. |
— | 10 months ago |
- ← Previous
- 1
- 2
- 3
- 4
- Next →