You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cordova.apache.org by Simon MacDonald <si...@gmail.com> on 2012/10/29 21:34:31 UTC
Duplicate commits in Cordova Android
Hey,
My last fix ended up duplicating a bunch of check in's. Not sure what I did
wrong but if anyone who's git-fu is strong than mine knows how to fix it
I'd be happy to get the info.
Thanks...
Simon Mac Donald
http://hi.im/simonmacdonald
Re: Duplicate commits in Cordova Android
Posted by Simon MacDonald <si...@gmail.com>.
Yeah, I realized I did not break anything it just looks odd. I'm going
to leave it be as whatever I do at this point would probably make it
worse.
Simon Mac Donald
http://hi.im/simonmacdonald
On Mon, Oct 29, 2012 at 5:02 PM, Andrew Grieve <ag...@chromium.org> wrote:
> I *think* it's fine (not broken). If you look at the history with:
>
> git log --graph --oneline --all
>
> you can see more detail about the merge history.
>
> If you rebase, and only merge using --ff-only, then you'll avoid the
> complicated history (it will be linear). I find the merges hard to follow,
> and the git web interface is not good at showing it either.
>
>
>
>
> On Mon, Oct 29, 2012 at 4:34 PM, Simon MacDonald
> <si...@gmail.com>wrote:
>
>> Hey,
>>
>> My last fix ended up duplicating a bunch of check in's. Not sure what I did
>> wrong but if anyone who's git-fu is strong than mine knows how to fix it
>> I'd be happy to get the info.
>>
>> Thanks...
>>
>> Simon Mac Donald
>> http://hi.im/simonmacdonald
>>
Re: Duplicate commits in Cordova Android
Posted by Andrew Grieve <ag...@chromium.org>.
I *think* it's fine (not broken). If you look at the history with:
git log --graph --oneline --all
you can see more detail about the merge history.
If you rebase, and only merge using --ff-only, then you'll avoid the
complicated history (it will be linear). I find the merges hard to follow,
and the git web interface is not good at showing it either.
On Mon, Oct 29, 2012 at 4:34 PM, Simon MacDonald
<si...@gmail.com>wrote:
> Hey,
>
> My last fix ended up duplicating a bunch of check in's. Not sure what I did
> wrong but if anyone who's git-fu is strong than mine knows how to fix it
> I'd be happy to get the info.
>
> Thanks...
>
> Simon Mac Donald
> http://hi.im/simonmacdonald
>