Version-Control

You tried to push your changes and git slapped you with this: ! e h h r i i [ r n n r o t t e r : : j : e U i c f p t t a d s e i a d l t r ] e e e d s m o t w t o e e r p e c u o s r u m h e n a j t i s e e n o c r m t p e e a d r r t m e b . a f e i s c n a t u ( o s n e o n o t - r h f i e a g s i t t n i - ' p f o o r f w a y r o d u ) r c u r r e n t b r a n c h i s b e h i n d This is one of the most common git errors, and it’s actually git protecting you from accidentally overwriting someone else’s work (or your own work from another machine). ...

Your Git workflow affects how fast you ship, how often you break things, and how much your team fights over merge conflicts. Choose wisely. The Contenders Git Flow The traditional branching model with long-lived branches: m a i └ n ─ ─ ( p d r e o v ├ ├ └ d e ─ ─ ─ u l ─ ─ ─ c o t p f f r i e e e o ( a a l └ n i t t e ─ ) n u u a ─ t r r s e e e e h g / / / o r u p 2 t a s a . f t e y 0 i i r m x o - e / n a n c ) u t r t - i h s t y i s c t a e l m - b u g How it works: ...

Git is powerful. It’s also easy to mess up. Here are workflows that keep repositories clean and teams productive. Solo Workflow For personal projects, keep it simple: 1 2 3 4 5 6 # Work on main, commit often git add -A git commit -m "Add user authentication" # Push when ready git push origin main Use branches for experiments: 1 2 3 4 git checkout -b experiment/new-ui # work... git checkout main git merge experiment/new-ui # or delete if failed Feature Branch Workflow The most common team pattern: ...

You know git add, commit, push, and pull. That gets you through 90% of daily work. But the remaining 10%—untangling merge conflicts, finding bug introductions, managing multiple branches simultaneously—requires deeper knowledge. Interactive Rebase The most powerful tool for cleaning up history before sharing. 1 2 3 4 5 # Rebase last 5 commits git rebase -i HEAD~5 # Rebase onto main git rebase -i main The editor opens with commits listed oldest-first: ...