When push is rejected suggest pulling first

kuychaco · kuychaco · commit f6146ae50d48 · 2016-09-12T13:46:15.000-07:00
diff --git a/js/controlbox.js b/js/controlbox.js
@@ -800,7 +800,7 @@ function(_yargs, d3, demos) {
       // push to an existing branch on the remote
       if (remoteCommit && remote.branches.indexOf(remoteRef) > -1) {
         if (!local.isAncestorOf(remoteCommit.id, localCommit.id) && !opt.f) {
-          throw new Error('Push rejected. Non fast-forward.');
+          throw new Error('Push rejected. Non fast-forward. Try pulling first');
         }
 
         isCommonCommit = localCommit.id === remoteCommit.id;

Original file line number	Diff line number	Diff line change
`@@ -800,7 +800,7 @@ function(_yargs, d3, demos) {`
`800`	`800`	`// push to an existing branch on the remote`
`801`	`801`	`if (remoteCommit && remote.branches.indexOf(remoteRef) > -1) {`
`802`	`802`	`if (!local.isAncestorOf(remoteCommit.id, localCommit.id) && !opt.f) {`
`803`		`- throw new Error('Push rejected. Non fast-forward.');`
	`803`	`+ throw new Error('Push rejected. Non fast-forward. Try pulling first');`
`804`	`804`	`}`
`805`	`805`
`806`	`806`	`isCommonCommit = localCommit.id === remoteCommit.id;`