If someone else has committed since I last synchronised the workspace,
I have found that I can eliminate some commit noise as follows:

$ git pull
$ git rebase -i origin/master
(just accept the suggested action)

If the workspace has other pending changes, the rebase may complain.
In which case it may be necessary to redo the rebase as follows:

$ git stash
$ git rebase -i origin/master
(just accept the suggested action)
$ git stash pop

The changes can then be pushed.

HTH

Reply via email to