On Tue, May 7, 2013 at 5:23 PM, Justin Mclean <jus...@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
