Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Recover lost commits #940

Merged
merged 4 commits into from
Nov 19, 2019
Merged

Recover lost commits #940

merged 4 commits into from
Nov 19, 2019

Conversation

kernelwhisperer
Copy link
Contributor

🦅 Pull Request

It seems that during a merge, a couple of commits have been lost:

image

I ignored the depandabot changes and cherry-picked only these 4 commits, I think it should be ok now.

Now that develop is protected, we'll have to use GitHub PRs for merging, but at least this should not happen anymore.

🚨 Test instructions

✔️ PR Todo

  • Include links to related issues/PRs
  • Update unit tests for this change
  • Update the relevant documentation
  • Clear dependencies on other modules that have to be released before merging this

@codecov
Copy link

codecov bot commented Nov 19, 2019

Codecov Report

Merging #940 into develop will increase coverage by 0.22%.
The diff coverage is 26.08%.

Impacted file tree graph

@@            Coverage Diff             @@
##           develop    #940      +/-   ##
==========================================
+ Coverage    10.07%   10.3%   +0.22%     
==========================================
  Files           91      91              
  Lines         2392    2397       +5     
==========================================
+ Hits           241     247       +6     
+ Misses        2151    2150       -1
Impacted Files Coverage Δ
packages/aragon-cli/src/commands/deploy.js 0% <0%> (ø) ⬆️
...aragon-cli/src/commands/dao_cmds/token_cmds/new.js 0% <0%> (ø) ⬆️
packages/aragon-cli/src/lib/token.js 100% <100%> (+12.5%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f6465fb...3965949. Read the comment docs.

@0xGabi 0xGabi merged commit 24331e7 into develop Nov 19, 2019
@delete-merged-branch delete-merged-branch bot deleted the fix-develop branch November 19, 2019 13:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants