flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From OmPrakash Muppirala <bigosma...@gmail.com>
Subject Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Date Wed, 08 May 2013 00:28:36 GMT
On Tue, May 7, 2013 at 5:23 PM, Justin Mclean <justin@classsoftware.com>wrote:

> Hi,
>
> > I get the impression he pulled the updates from origin then merged his
> > changes which kept his timeline when he last pulled.
> Which wouldn't produce this result I believe.
>
> >  So it's showing everybody's commits merged into his develop since then?
> Makes it very hard to see what has actually changed.
>
> Justin
>


This is expected with pull+merge.  Justin, why do you think something went
badly wrong?

In my log view, I see two set of diffs - 'Diff with parent 1' and 'Diff
with parent 2'.  Diff with parent 2 shows the relevant changes by Gordon.

Thanks,
Om

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message