====== GIT Pipelines and How To's ======
===== Merge a feature branch =====
<code>
git checkout master
# Merge with squash so it's clean
git merge feature-branch master --squash
git checkout master
git commit -a
# Remove local and remote branch
git branch -d feature-branch
git push origin --delete feature-branch
</code>

===== How to... =====


==== Configure an ssh key ====

Generate an ssh key without passphrase or it will keep asking you for for it. You need to upload the public key to the server. Then, configure the host in your ssh config:

<code>
Host bitbucket.org
IdentityFile ~/.ssh/keys/gitkey
</code>

This will allow you to do:
<code>
git clone git@bitbucket.org:gfms/shopifyapp.git
</code>

ℹ️ If you want to debug, you can do:
<code>
ssh -vvv git@git.alfredgg.dev
</code>
==== This could be a good config ====
<code>
Host git.alfredgg.dev
Port 222
IdentityFile ~/.ssh/keys/gitkey
User git
</code>

==== Commits ====

==== ... get a commit from another branch? ====
<code>
git cherry-pick <commit>
</code>


==== Merges ====
=== ... abort a merge? ===
<code>
git merge --abort
</code>

==== Reset ====

=== ... make a big reset? ===
Also cleaning new files
<code>
git clean -f -d 
git reset --hard
</code>