[Libreoffice] Questions about push access

[Stephan Bergmann]

On 10/06/2011 08:22 PM, Ivan Timofeev wrote:
> 2. What changes should I avoid in my commits? I mean, what changes are
> unwanted, needless, etc.

One thing to watch out for is to avoid pushing accidental merge commits. 
  (It does happen, and is harmless, but also easily avoided.)  That is, 
if you cannot push because someone else already pushed something newer, 
do a "git pull --rebase" before your next push attempt, so that your 
local changes are shuffled around to the branch head and git does not 
need to create a merge commit.

-Stephan