You must log in or # to comment.
- Save a file
- Commit it
- Change that same file
- Commit it
- Get a weird error message about fast-forwarding local branch detached from remote while merging with a helpful suggestion to change your config.
- The config change made the error message slightly different.
- Google the error messages. Only one hit. The git source code.
- Try to clone the git repo to investigate.
- Get a new error message. Nothing makes sense now.
- Burn house down, move to New Zealand, live as a sheep. Git will never harm you again.
You don’t absolutely need a central repository for Git. It’s decentralized. You can learn the basics (committing, branching, rebasing, amending, merging, resolving merge conflicts) entirely on your computer.
My advice would be to get familiar with using Git locally first. Simulate things like merge conflicts - have two branches that both change the same line in a text file, then merge them together and resolve the conflict.
Once you’re more comfortable with using it locally, learn about code forges like Github or Forgejo.
I always recommend Oh My Git.
Thanks. This is what I had been looking for.
The people who’ve made this are both on the Fediverse:
https://vis.social/@bleeptrack https://chaos.social/@blinry
🎉
Just responded to a post by bleeptrack.
The “pull” can get confusing to new users of git because they soon see people talking about “pull requests”. They should rename a pull request to a “sync request” or an “update review request” , etc.
It’s called a “merge request” in Gitlab, which is a much better name.
Yes, That would be good, easy, and understandable
There is Pro Git book also.
ChatGTP told me to read it after I wiped 4 hours of work by listening to llms :DI don’t need a manual to read. I treat it like a new piano, whose keys l press to see what kind of sound they make. Makes any sense ?
If it makes sense for you all that matters. I’m the type of person who reads the manual first :)
