Register a SA Forums Account here!
JOINING THE SA FORUMS WILL REMOVE THIS BIG AD, THE ANNOYING UNDERLINED ADS, AND STUPID INTERSTITIAL ADS!!!

You can: log in, read the tech support FAQ, or request your lost password. This dumb message (and those ads) will appear on every screen until you register! Get rid of this crap by registering your own SA Forums Account and joining roughly 150,000 Goons, for the one-time price of $9.95! We charge money because it costs us money per month for bills, and since we don't believe in showing ads to our users, we try to make the money back through forum registrations.
The Something Awful Forums > Discussion > Serious Hardware/Software Crap > The Cavern of COBOL > Version Control Questions Megathread (SVN / git / whatever else)
 
  • Post
  • Reply
lifg
Dec 4, 2000
<this tag left blank>
Muldoon
Read https://git-scm.com/ . Then read "A successful Git branching model" at http://nvie.com/posts/a-successful-git-branching-model/ to learn how to do branching the hard way. Then learn literally any other model. At least half the popular Git branching models are a reaction against that one. Then form oddly strong opinions on rebase v. merge, and have an argument on "what does a commit represent?"

Boom. You're now the Git wizard in the company.

* # ¿ Jul 17, 2017 18:50
  • Quote
Adbot
ADBOT LOVES YOU

# ¿ May 14, 2024 02:33
  • Quote
lifg
Dec 4, 2000
<this tag left blank>
Muldoon

chippy posted:

I use GitFlow. What's a better one? I'm about to start a new project, could be good to know.

There isn't "better", just "appropriate for your needs". Since you already have experience, I say you should try building a branching strategy that works for your testing and deployment requirements. It's sounds dry, but it's actually kinda fun.

That said, GitHubFlow is nice and simple.

* # ¿ Jul 19, 2017 13:38
  • Quote
lifg
Dec 4, 2000
<this tag left blank>
Muldoon
Read Pro Git at https://git-scm.com/book/en/v2 , specifically the last chapter, Git Internals. Read that first, then go back and learn the weird Git commands.

* # ¿ Nov 10, 2017 18:43
  • Quote
lifg
Dec 4, 2000
<this tag left blank>
Muldoon

James Baud posted:

A bit of looking around has also found https://rtyley.github.io/bfg-repo-cleaner/

Its "--strip-blobs-bigger-than" option appears to do exactly what I want to do indiscriminately (trimming old, preserving current), in what it claims is significantly less time than git-filter-branch.

I’ve used this before, and did the job perfectly.

* # ¿ Dec 22, 2017 15:36
  • Quote
lifg
Dec 4, 2000
<this tag left blank>
Muldoon
.gitignore file with something like:

*
!file-to-track
!another-file-to-track

* # ¿ Feb 19, 2019 23:56
  • Quote
lifg
Dec 4, 2000
<this tag left blank>
Muldoon

Hippie Hedgehog posted:

In case anyone is still able to edit the OP, I'm surprised the Pro Git book is not the first resource linked for Git. It serves very well as a progressive beginners' guide to Git.

https://git-scm.com/book/en/v2

If you want to work in my team, you read and learn up to and including chapter 3, then we can teach you the rest on the job.

Then struggle with git in the real world for a little while, then read chapter 10.

* # ¿ Dec 17, 2019 04:36
  • Quote
lifg
Dec 4, 2000
<this tag left blank>
Muldoon
You can make some noise now and have some conversations with your boss about this. Then wait. Then if something goes wrong that a nicer process would have solved you’ll be well positioned to make the change.

* # ¿ Jun 5, 2023 13:26
  • Quote
Adbot
ADBOT LOVES YOU

# ¿ May 14, 2024 02:33
  • Quote
lifg
Dec 4, 2000
<this tag left blank>
Muldoon
That’s weird, I always thought SVN was an old and established piece of software by the time git appeared, but you’re right.

* # ¿ Oct 12, 2023 00:41
  • Quote
  • 1
  • 2
  • 3
  • 4
  • 5
  • Post
  • Reply
The Something Awful Forums > Discussion > Serious Hardware/Software Crap > The Cavern of COBOL > Version Control Questions Megathread (SVN / git / whatever else)