_git

_

# Fetch latest changes before merging
git fetch origin

# Push updated branch after merging
git push origin my-feature-branch

# Use rebase instead of merge (cleaner history)
git rebase master


# Push an existing repository from the command line
git remote add origin [email protected]:e10a/cocoesque-animations-vite.git
git branch -M main
git push -u origin main

merge master to current branch

# Merge master into the current branch
git merge master

pull master without switching branches

git fetch origin master:master

#Merge master into the current branch
git merge master

#Fetch latest changes before merging
git fetch origin

#Push updated branch after merging
git push origin my-feature-branch

#Use rebase instead of merge (cleaner history)
git rebase master



Added new .ts  files in src/resources/onboarding/v2
steps.json data structure that can be edited for string changes and re-ordering of steps
form-data-default.ts to be able to import default data for this large form
inputs-member-primary.ts input fields with various attributes necessary to render inputs for Add Primary User
inputs-member-partner.ts same as above but for Add Co-Pilot/Partner
inputs-member-child.ts same as above but for Add Child
Added new tsx files in src/components/onboarding 
Reusable components to render form fields across all member types (primary, partner, child)
FormFieldEmailAddress.tsx holds email related validation business logic
FormFieldPhoneNumber.tsx 
FormFieldSelect.tsx  only works for Roles input at this time
FormFieldText.tsx  
These are responsible for rendering group of form fields for a given member type (primary, partner, child)
PrimaryInputs.tsx
PartnerInputs.tsx
ChildInputs.tsx
Other components introduced to improve managability
AddChildButton.tsx
StepHeader.tsx
Updates to existing files
src/types/family.d.ts added option key for phone
src/types/onboardingForm.ts this is a new file for types needed to support updated onboarding structure
src/types/index.d.ts updated to import the new onboardingForm.ts file
src/utils/index.ts
Added new method capitalize 
Updated convertKebabOrSnakeToCapitalize to return early if provided string is empty

show list of commit descriptions

# show last 10
git log -n 10 --pretty=format:"%s"

stash specific files only

git stash push file1.txt file2.txt

app/controllers/api/v1/guest/checkout_controller.rb
client/app/bundles/NonMember/NonMemberOrderConfirmation.jsx
client/app/shared/modules/AnalyticsHelper.js
test/features/roxy/cart_modal_logged_out/cart_modal_checkout_stripe_test.rb

# stash only the staged changes
git stash --keep-index

# stash both staged and unstaged changes
git stash

# stash untracked file as well
git stash -u