acontreras89

Git tips and tricks

If the branch we are working on has been updated before we push our work

We will get an error like this:

[rejected] master -> master (non-fast forward)
error: failed to push some refs to '[email protected]:me/me.git'
To prevent you from losing history, non-fast-forward updates were rejected

acontreras89

Result using git diff without arguments:

diff --git a/src/index.js b/src/index.js
index 56a41c3..c2b401b 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,6 +3,7 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 import { Router, Route, Switch } from 'react-router-dom'