git

# Spit commits
git reset HEAD~

# Exit merge
git reset --hard HEAD
git pull --strategy=theirs remote_branch
git fetch origin
git reset --hard origin

# Reset to specific branch
git reset --hard origin/chore/ois/1942-take-2

# Fetch all branches
git fetch --all

# Merge tool - opendiff (needs xcode installed)
## Set "opendiff" as the default mergetool globally
git config --global merge.tool opendiff
git mergetool -t opendiff

## Install VS extension
Git Diff and Merge Tool



# Fetch all branches and delete local branched that are deleted in github
git branch -vv | grep 'origin/.*: gone]' | awk '{print $1}' | xargs git branch -D
git fetch --prune

git branch -vv

git branch -vv | grep ': gone]'|  grep -v "\*" | awk '{ print $1; }' | xargs -r git branch -d

# Rebase
git commit --amend
git rebase --continue

## Abort
git rebase --abort

# Merge test
Auto-merging concept-client/webpack.dev.config.js
CONFLICT (content): Merge conflict in concept-client/webpack.dev.config.js
Auto-merging concept-client/src/components/app-header/app-header.scss
CONFLICT (add/add): Merge conflict in concept-client/src/components/app-header/app-header.scss
Auto-merging concept-client/src/components/app-header/app-header.component.tsx
CONFLICT (add/add): Merge conflict in concept-client/src/components/app-header/app-header.component.tsx
Auto-merging concept-client/src/assets/style/bootstrap-override.scss
CONFLICT (add/add): Merge conflict in concept-client/src/assets/style/bootstrap-override.scss
Auto-merging concept-client/src/app/App.tsx
CONFLICT (content): Merge conflict in concept-client/src/app/App.tsx
Auto-merging concept-client/package.json
CONFLICT (content): Merge conflict in concept-client/package.json
error: could not apply 994b694... chore: #1846 Styling

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

# Merg Conflic
git pull origin prod
git checkout feat/gs/footer
git pull origin feat/gs/footer
git merge develop

git merge --abort

# Merg Conflict no2
1. Solve the conflic in console
2. run: git rebase --continue
3. run a Force Push