[sugar] [PATCH] Refactor invites for 1-1 Chat (#6298)

[Michael Stone]

On Fri, May 23, 2008 at 05:12:29PM +0200, Morgan Collett wrote:
> I will get this patch up in my git repo, as soon as I can figure out
> why it won't allow me to push (non-fast forward).

Git is warning you about divergence: there are patches on the branch
you're pushing into that you have not yet 'seen' since they aren't in
the history of the branch you're pushing.

If you know what you're doing, you can force the push with the '-f'
flag. If you screw up, check the reflogs in

  .git/logs/refs/heads/<branch> 
  
in the remote repo. (The .git might be absent if it's a bare repo).

If you want to see the patches that you're missing, run 
 
  git remote update
  gitk --all

and look for remote branches.

Finally, to incorporate the changes, you can merge or rebase.

Let me know if more detail is required,

Michael