#VersionControl
#Development #Clarifications
Git branches: intuition and reality · Are you confused about how Git branches work? Read on https://ilo.im/15i34f
An old project I used to work on used Perforce for version control. It has been years and I still shudder at the thought of it
Any experience using #sapling for #versioncontrol? A friend just dearly recommended it to me.
https://engineering.fb.com/2022/11/15/open-source/sapling-source-control-scalable/
Terraform for Developers by GitforGits | Asian Publishing House is on sale on Leanpub! Its suggested price is $29.99; get it for $23.99 with this coupon: https://leanpub.com/sh/k855HaXB #SystemIntegration #VersionControl #SoftwareEngineering #Terraform #InfrastructureAsCode
@ellie @b0rk About "leaking the distributed acyclic graph abstraction all over the floor."
The Law of Leaky Abstractions (coined by Joel Spolsky) states: _"All non-trivial abstractions, to some degree, are leaky."_
Still, the directed acyclic graph of revisions + references in #git is IMVHO a better abstraction than dotted revision numbers (CVS), folder copying (Subversion), or applying and re-applying patches (Arch and its descendants) for #versioncontrol
#GitHub (for newbies) question:
How can you easily share code folders across repositories? For example you have a “Project 1” repo and a “Project 2” repo and you would like to share a “Stats” folder between them.
The obvious solution that comes to mind is just create a Stats repo and make sure that anyone using either your Project1 or Project2 code also clones your Stats code and adds it as a dependency somehow. But that’s not super convenient. Also it means you have to commit / push independently for all 3 repos and if you have a lot it starts to be annoying.
The ideal solution would use #GithubDesktop and has to work on Windows… 🙏
#Coding #VersionControl #Git
#Development #Cheatsheets
Confusing Git terminology · A compilation of Git’s most weird terms with explanations https://ilo.im/15f62z
_____
#WebDev #Git #VersionControl #Terminology #Explainer #Frontend #Backend #Collection
A family member in her first semester at the university shall learn how to use #github. She has no clue about repositories, but is asked to create a github page and edit the Readme. Why start with two different domains (github.com and github.io) and the github page concept? Why not first get a grip on what is #VersionControl / #SourceControl and how to work a bit with the #repos? Weird curriculum, IMHO. #SCM
Repository Formats Matter: 2007 notes from Keith Packard about why the X Project migrated from CVS to git (instead of Subversion or Mercurial)
https://keithp.com/blogs/Repository_Formats_Matter/
#versioncontrol #mercurial #software #tools #dvcs #git #x11 #+
Git Prodigy by Ebenezer Don is on sale on Leanpub! Its suggested price is $19.00; get it for $7.99 with this coupon: https://leanpub.com/sh/GF1IGD8c #Git #ComputerProgramming #VersionControl
Terraform for Developers by GitforGits | Asian Publishing House is on sale on Leanpub! Its suggested price is $29.99; get it for $23.99 with this coupon: https://leanpub.com/sh/yP3ELau9 #SystemIntegration #VersionControl #SoftwareEngineering #Terraform #InfrastructureAsCode
#Development #Techniques
13 tips for better pull requests and code review · Enhance your teamwork skills in writing top-notch code https://ilo.im/15d86n
_____
#WebDev #Code #Collaboration #VersionControl #PullRequests #CodeReviews #Frontend #Backend
@emmy @mcc what might happen soon we might end up in #versioncontrol systems that operate on pre-parsed binary syntax trees. Problem solved? But I am not sure I'd be happy with THAT solution. #vcs #git
Terraform for Developers by GitforGits | Asian Publishing House is on sale on Leanpub! Its suggested price is $29.99; get it for $23.99 with this coupon: https://leanpub.com/sh/fyeZPvf1 #SystemIntegration #VersionControl #SoftwareEngineering #Terraform #InfrastructureAsCode
Terraform for Developers by GitforGits | Asian Publishing House is on sale on Leanpub! Its suggested price is $29.99; get it for $23.99 with this coupon: https://leanpub.com/sh/kT7QykY1 #SystemIntegration #VersionControl #SoftwareEngineering #Terraform #InfrastructureAsCode
#Development #Reviews
VS Code Timeline · Your local version control system without Git repository https://ilo.im/15cqow
_____
#WebDev #CodeEditor #TextEditor #VersionControl #Frontend #Backend
Terraform for Developers by GitforGits | Asian Publishing House is on sale on Leanpub! Its suggested price is $29.99; get it for $23.99 with this coupon: https://leanpub.com/sh/qKvYP8c5 #SystemIntegration #VersionControl #SoftwareEngineering #Terraform #InfrastructureAsCode
"What's in that .git directory?" https://blog.meain.io/2023/what-is-in-dot-git/
A step-by-step walk-through, and visually appealing too. Having been using git for over a decade now, was a rather amusing read.
Linux DevOps eBook Bundle https://leanpub.com/b/linux-devops-ebook-bundle by Bobby Iliev is the featured bundle on the Leanpub homepage! https://leanpub.com #Databases #Mysql #Postgresql #ComputerProgramming #Devops #CloudComputing #Git #VersionControl
One of the companies that worked for at the beginning of my career, I’ve introduced them to the concept of issue management software and their notion of version control was saving WinRar archives on a Windows XP shared drive.
What’s your #horrorstory ?
#bugtracking #issuetracking #versioncontrol
Lots of useful tidbits on #ASCII, #TerminalEmulators, etc. from #hacker lore:
“Things Every Hacker Once Knew” [2018], Eric S Raymond (http://www.catb.org/~esr/faqs/things-every-hacker-once-knew/).
Via HN: https://news.ycombinator.com/item?id=37701117
#ComputerHistory #Unix #Terminals #Teletype #RS232 #Modem #Internet #VersionControl
"How to Clean Up Your Local Repository with Git Commands - DEV Community" https://dev.to/this-is-learning/how-to-clean-up-your-local-repository-with-git-commands-531o #git #versioncontrol #dev
Game of Trees 0.93 released https://undeadly.org/cgi?action=article;sid=20230919062825 #openbsd #gameoftrees #git #got #versioncontrol #development
So who wants to help the @Codeberg folks implement code search?
https://codeberg.org/Codeberg/Community/issues/904
#git #codeberg #search #scm #versionControl #foss #openSource #dev
What am I doing? Why, voting to help decide @Codeberg policy as a member.
(Wait a minute, you can’t do that on GitHub? How odd… sounds a bit autocratic to me…) ;)
Seriously, though, check out https://codeberg.org – they’re doing everything right.
There are alternatives and if we want them to survive, we must support them.
Game of Trees 0.92 released https://undeadly.org/cgi?action=article;sid=20230830052402 #openbsd #gameoftrees #git #got #versioncontrol #development
"20 Git Commands That Will Make You a Version Control Pro. - DEV Community 👩💻👨💻" https://dev.to/devland/20-git-commands-that-will-make-you-a-version-control-pro-149p #git #versioncontrol #developer
List your #git #braches by commit date. Handy to let you know where you left off at when bouncing between branches https://stackoverflow.com/questions/9236219/git-list-git-branches-sort-by-and-show-date
...new article idea
Check out my latest blog post on mastering advanced #git commands and techniques!
In this post, I've covered a range of techniques that can significantly enhance your #productivity as a #developer. From efficient #committing and #branching to #merging, #searching, #cleaning, and much more - these tips will help you navigate your version control system like a pro.
Check out the full post here: https://www.javedali.net/post/23-advance-git-commands-shortcuts/
#coding #programming #versioncontrol #DevOps #SoftwareDevelopment
💻 #UnityTips: Use a version control system like Git to keep track of your #Unity #Unity3D project changes! 🚀Never lose important code or assets again. #VersionControl #GameDev #IndieDev #Unity #Unity3D #Git https://github.com/spoiledcat/git-for-unity
Jujutsu: A Git-compatible DVCS by Google: https://github.com/martinvonz/jj
#linux #update #foss #release #git #alternative #versioncontrol #jujutsu #google
Having your own version control is very handy, privacy friendly and very easy to install in a FreeBSD/TrueNAS jail. This series of articles explains how anyone can run their own Gitea service.
[de] https://bsdbox.de/artikel/gitea
[en] https://bsdbox.de/en/artikel/gitea
It took me 2 days to realise I need to try another kind of refactoring to allow for my changes first.
People, use #VersionControl to be able to revert changes in 15 minutes and still be ok.
#GameDev
Game of Trees 0.91 released https://undeadly.org/cgi?action=article;sid=20230720123711 #gameoftrees #got #git #versioncontrol #development #openbsd
@randy5235 Controlling one’s own code isn’t really the point of a package repository. It’s for software releases. The code and content (hopefully) lives in a separate #VersionControl system where changes are more granular than new version releases.
And as you note, there are efforts like #ForgeFed to enable federated software development with distributed VC, issue tracking, forking, pull requests, merging, etc.
I don’t know if it’s useful to commingle the two.
SemanticDiff for VS Code and now for GitHub are two things I like to try:
Game of Trees 0.90 released https://undeadly.org/cgi?action=article;sid=20230624054334 #openbsd #got #git #gameoftrees #versioncontrol #development
*teammate reports a bug*
Hmm, that doesn't happen on my machine. Have you pulled the latest version of main? Yes?
What's commit number are you on? Yes, that's the one I'm on.
Do either of us have any unstaged changes? No?
Other teammate, does this happen for you? No? Okay, it's just the one person.
Try restarting Unity.
Reboot your computer.
Okay, delete the entire repository, re-clone it, and open that in Unity.
THAT fixed it.
People working in research code development: how do you approach your branching strategy? Everyone commits on main, or you have a main/dev branch? Do you branch for features? Do you have scheduled code reviews?
I'm mostly interested in small teams, or even people who work alone. Do you still use branching when you are the only developer?
Too Much Git? Try Gitless - Git has been a powerful tool for software development and version control since th... - https://hackaday.com/2023/06/18/too-much-git-try-gitless/ #softwaredevelopment #versioncontrol #development #opensource #simplified #software #gitless #learn #git
Backup with Git: Andreas Stolzenberger shows you how to use Git to create versioned backups of local drives https://www.fosslife.org/create-versioned-backups-git #backup #Git #sysadmin #tools #VersionControl #operations
Game of Trees 0.89 released https://undeadly.org/cgi?action=article;sid=20230605195502 #openbsd #got #git #versioncontrol #development #programming
Lovely historical retrospective on #versioncontrol programs by #stackoverflow. Particularly interesting to learn some of the different features some fields need, for example the games industry.
Beyond Git: The other version control systems developers use
https://stackoverflow.blog/2023/01/09/beyond-git-the-other-version-control-systems-developers-use/
Effective Git for Community Projects.
RSVP #Cairo #Maghreb
https://www.meetup.com/softwarehubcairo/events/293934220/
RSVP #Ankara #Turkiye
https://www.meetup.com/softwarehub/events/293934269/
RSVP #Riyadh #Mashreq
https://www.meetup.com/softwarehubriyadh/events/293934241/
All members of the Ummah are welcome to attend
#Git
#VersionControl
#Ankara
#Egypt
#Cairo
#Algiers
#Tunisia
#Morocco
#Nigeria
#Ethiopia
#Africa
#Sudan
#Riyadh
#Dammam
#Damascus
#Baghdad
#Mosul
#Basra
#Manama
#Doha
#Dubai
#Sana
#Aden
#Muscat
#Iran
#Kabul
#Dhaka
#Jakarta
#KualaLumpur
#Bosnia
#SoftwareHub
#SoftwareFreedom
Will #Git be around forever? Or is it about to be beaten by a competing product? More questions like that (and also some answers) in my talk on #VersionControl later today! Join me in Room 2 at 18:10 to hear more. #DevoxxPL#DevoxxPoland
Want a easy-to-install git server to experiment with things?
Say no more. Meet Soft Serve: A tasty, self-hostable Git server for the command line » https://github.com/charmbracelet/soft-serve
📝 "Get your code on GitHub with Git — a beginners guide"
👤 Jessica Greene (@sleepypioneer)
#pyladies #python #beginnersguide #git #github #versioncontrol #learntocode
Game of Trees 0.88 released! https://undeadly.org/cgi?action=article;sid=20230430102710 #gameoftrees #got #git #versioncontrol #development
Game of Trees 0.87 released https://undeadly.org/cgi?action=article;sid=202 30421064904 #openbsd #got #git #versioncontrol #development
Turns out that two more of my talks have been accepted for #DevoxxPL! On top of the talk on #PatternMatching, I will do my #VersionControl talk (about a few #Git alternatives) and a live-coding Lightning talk about the things I learned while getting #JavaCertified. Looking forward!
Btw., #Testing and #VersionControl are super powers, not as in "a gift only a few possess", but as in "super useful", in case you were wondering here: https://fosstodon.org/@underlap/110157663287543252
They really are the hygiene factors of #softwareDevelopment: if used, you don't notice much, if not your codebase starts to smell terrible very quickly.
Spent some time in the wonderful city of #Rotterdam today with the equally wonderful Peter Hilton. Exchanging talk ideas and improvements for #Agile software development and #VersionControl. That's a morning well spent! 😃
I would definitely get on board with something like a #GitHub Audio Edition.
I'd also really like to put my entire #MusicProduction environment in #VersionControl, kinda like how #Docker works for software devs.
Just imagine, in addition to having your project files in #SourceControl, you could also have your #DAW, #plugins, #presets, #samples, #drivers, etc., all saved in the precise state required for every project you've ever worked on. Need to revisit a project from several upgrades ago? Just checkout the most recent commit from that project, and everything would be exactly as you left it.
This would also allow you to upgrade your #hardware independently from your #software, and/or restore everything to perfect working order on a new machine within minutes (instead of hours or days) in case of theft, damage, or catastrophic hardware failure.
IMO, the necessary tech to make this kind of thing possible isn't *quite* there yet, but probably will be soon. 🤞
@303 @ConatusPrinciple
Definitely a sad day, but perhaps it's a blessing in disguise. Maybe this will be the last straw, and #MusicProducers will finally start thinking/acting like #SoftwareDevelopers, embracing the #AgileMethodology, and using proper #VersionControl tools like #git and #GitHub for #backups / #VersionHistory and #collaboration with other #musicians.
Hey #PowerBI peeps, I'll be on #ToolTalk with Artur König and @mthierba on Tuesday, March 21st.
We'll be talking about a little #ExternalTool I wrote for #PowerBIDesktop called #PbiToolsWatchPS, which launches a #PowerShell window running #pbitools in #WatchMode on the current #pbix file. The purpose of this little tool is to minimize the effort and number of steps necessary to #commit changes to Power BI #reports and #datasets into a proper #VersionControl system like #GitHub, #AzureDevOps, etc.
Please join us #LIVE on Tuesday, March 21st, give us your thoughts about the current state of #CICD and #DevOps / #DataOps for Power BI, and tell us about your favorite #ToolsOfTheTrade!
RSVP for the #ToolTalk session on #LinkedIn here:
https://lnkd.in/gzZSxf_f
Download #pbitools here:
https://pbi.tools
Download #PbiToolsWatchPS here:
https://github.com/JamesDBartlett3/PowerBits/blob/main/ExternalTools/046-PbiToolsWatchPS5.1.pbitool.json
Game of Trees 0.86 released https://undeadly.org/cgi?action=article;sid=20230313064231 #openbsd #gameoftrees #git #versioncontrol #development
Game of Trees 0.85 released https://undeadly.org/cgi?action=article;sid=20230308183022 #openbsd #got #git #versioncontrol #devtools #developer
After spending a couple hours on a #pico8 project, my youngest accidentally wiped out his work by saving a new project over his current one. He was so bummed. Tonight we'll be diving into #VersionControl and getting Time Machine setup on a network drive.
Do you use git from within your IDE or from the command line?
This must be easy to do if you are a professional software developer (which I'm not, I'm an "end user programmer" and educator), here goes the problem:
I have some code, let's call it "origin" (you can correct my names in the replies if you really have to), and I have a modified version of it, let's call it "my fork".
when "origin" gets updated I'd like to apply to "my fork" the modifications that don't affect my own previous modifications, and be shown the ones that conflict.
This is standard git merge conflict resolution, isn't it?
Is there a way of doing it outside the dreadful git context/interface?
<<<<<<< HEAD
B
=======
Z
>>>>>>> branch-a
👆 git is already awful for us end user programmers, but this is plain hell.
Git commands Cheat Sheet. #Git #VersionControl #Linux #Cheatsheet
Via -> https://twitter.com/denicmarko/status/1538104384244133888/photo/1