Re: [Freerdp-devel] git question

[Marc-André M. <mar...@gm...>]

When you do a git pull because someone else did a push in the mean time, git
will automatically do the merge for you, which is why you have an extra
commit that says "Merge branch 'master' of ssh://
js...@fr.../gitroot/freerdp/freerdp". However, that
should normally not break the functionality of git.

On Sun, Mar 28, 2010 at 4:55 PM, Jay Sorg <jay...@gm...> wrote:

> > I think I'm to be blamed, I don't know what happened in my last commit
> that
> > caused this problem. I did a fresh git clone and it worked again.
>
> I think this happens all the time if the following events occur.
>
> I do a fresh git clone
> I start to work
> someone else pushes some change
> I try to push and it fails because of the preceding push.
> I do pull, then push
> The log entry appears.
>
> Jay
>