Git memos

Steps to start a new sprint

• Create a new branch from develop (example: sprint24).

  git checkout develop
  git pull
  git checkout -b feature/newTicket
  git push --set-upstream origin feature/newTicket
  

• Create a new branch from develop (example: sprint24).

git checkout develop
git pull
git checkout -b sprint24
git push --set-upstream origin sprint24

• Create a branch for every ticket, from sprint24 branch (example: feature/newTicket).

git checkout sprint24
git pull
git checkout -b feature/newTicket
git push --set-upstream origin feature/newTicket

Steps to put into prodection

• Merge all branch tickets of sprint with the root sprint24 branch.

git checkout sprint24
git merge feature/name-branche
git merge feature/name-branche2
git push

• Merger (sprint24) with develop.

git checkout develop
git pull
git merge sprint24
git push

• Add notable changes in CHANGELOG.md. Merge develop with master.

git checkout master
git pull
git merge develop
git add CHANGELOG.md
git commit -m "CHANGELOG.md"
git push
git tag 1.15.3
git push --tags

Some useful commands

• To reset all commit

git reset --hard origin/master 

• To see/get the sha1 id of the commit you want to come back too

gitk --all 

• To roll back to that commit

git reset --hard sha1_id 

• Delete a remote Git tag

git tag -d 1.01.1
git push origin :refs/tags/1.01.1 

• Delete a commit

 git revert d3fbbacfc87