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

feat(backups,vhd-lib): implement copyless merge #6271

Merged
merged 8 commits into from
Jun 22, 2022

Conversation

fbeauchamp
Copy link
Collaborator

@fbeauchamp fbeauchamp commented Jun 7, 2022

should review by commits

Check list

Check if done, if not relevant leave unchecked.

  • PR reference the relevant issue (e.g. Fixes #007 or See xoa-support#42)
  • if UI changes, a screenshot has been added to the PR
  • documentation updated
  • CHANGELOG.unreleased.md:
    • enhancement/bug fix entry added
    • list of packages to release updated (${name} v${new version})
  • I have tested added/updated features (and impacted code)

Process

  1. create a PR as soon as possible
  2. mark it as WiP: (Work in Progress) if not ready to be merged
  3. when you want a review, add a reviewer (and only one)
  4. if necessary, update your PR, and re- add a reviewer

From the Four Agreements:

  1. Be impeccable with your word.
  2. Don't take anything personally.
  3. Don't make assumptions.
  4. Always do your best.

packages/vhd-lib/merge.js Outdated Show resolved Hide resolved
packages/vhd-lib/merge.js Outdated Show resolved Hide resolved
@fbeauchamp fbeauchamp force-pushed the feat_implement_rename_merge branch 3 times, most recently from 1d48f50 to ca35ed2 Compare June 13, 2022 13:51
@fbeauchamp fbeauchamp requested a review from julien-f June 14, 2022 08:13
CHANGELOG.unreleased.md Outdated Show resolved Hide resolved
packages/vhd-lib/merge.js Outdated Show resolved Hide resolved
packages/vhd-lib/merge.js Outdated Show resolved Hide resolved
@fbeauchamp fbeauchamp force-pushed the feat_implement_rename_merge branch 2 times, most recently from 1b6032d to ad244f8 Compare June 15, 2022 15:06
@fbeauchamp fbeauchamp requested a review from julien-f June 15, 2022 15:10
CHANGELOG.unreleased.md Outdated Show resolved Hide resolved
Co-authored-by: Julien Fontanet <julien.fontanet@isonoe.net>
@fbeauchamp fbeauchamp requested a review from julien-f June 21, 2022 18:55
@julien-f julien-f changed the title feat(Backups): implement copyless merge feat(backups,vhd-lib): implement copyless merge Jun 22, 2022
@fbeauchamp fbeauchamp force-pushed the feat_implement_rename_merge branch 2 times, most recently from 52374a1 to b13b14b Compare June 22, 2022 08:29
@julien-f julien-f merged commit fd752fe into master Jun 22, 2022
@julien-f julien-f deleted the feat_implement_rename_merge branch June 22, 2022 08:36
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.

None yet

2 participants