git config --global user.email "[email protected]"

git config --global user.name "Adee Macdowell"

git checkout develop && git fetch && git checkout @{-1} && git rebase develop

---

updating git password:

git config remote.origin.url https://you:[email protected]/you/example.git

git config remote.origin.url https://adeemacdowell:[email protected]/birite/knaps.git

git config credential.helper store

---

git rebase -i HEAD~5

Where 2 is the number of commits you want to squash

Change to

---

MANUALLY RESOLVE MERGE CONFLICTS

1. $ git pull origin <destination_branch>

2. See the list of conflicts

   CONFLICT (content): Merge conflict in knaps/tickets/templates/tickets/upload-ticket-image-upload.html

   CONFLICT (content): Merge conflict in knaps/tickets/templates/tickets/printouts/shelve-ticket-page.html

   CONFLICT (content): Merge conflict in knaps/tickets/models.py

3. In pycharm navigate to the files

4. Do search for >>>

5. Remove the conflicts

6. git add -u

7. git commit -m 'this is my msg'

8. Using pycharm do a force push

---

DELETE all branches == git branch | grep -v "develop" | xargs git branch -D

DELETE all untracked files == git clean -df

git prune

---

git fetch --prune

Updates all the remote refs on your local machine