search

novoda / download-manager

A library that handles long-running downloads, handling the network interactions and retrying downloads automatically after failures
Apache License 2.0
483 stars 63 forks source link

2.3.1 Develop to Release #490

Closed Mecharyry closed 5 years ago

Mecharyry commented 5 years ago

We want to release the following:

488 Downloaded notification re-shown

479 Quick Returns

Version 2.3.1 because this is patching a bug and not much else.

Mecharyry commented 5 years ago

There's an excessive number of commits because of a squash that was previously used. In case you are wondering.

zegnus commented 5 years ago

@Mecharyry a squash collapses several commits into one, how come there is an excessive number of commits because of a previous squash?

Mecharyry commented 5 years ago

@zegnus I don't honestly know but it's the only thing that has changed between the past release and all others as far as I can tell. The changes are correct but the reported commits are just all present.

Dorvaryn commented 5 years ago

If those previous changes were squashed into release before and release was not merged back into develop subsequently then those commits still exist into develop, hence why this PR shows them all. We can merge as is or we could try and merge release into develop first to see if this workflow would prevent such issues in the future.

zegnus commented 5 years ago

Ah yes, I was thinking that same scenario

Mecharyry commented 5 years ago

I've tried merging release into develop thinking that might solve the issue, it did not 😄

Dorvaryn commented 5 years ago

No point blocking this since the diff is correct. But we might need to define a proper workflow if we want to use squashes. Prs like this will make following what is going on a lot more complicated