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

Rebase announcement: schedule and change summary #15

Merged
merged 1 commit into from
May 24, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Rebase announcement: schedule and change summary
  • Loading branch information
mounaiban committed May 24, 2022
commit 06b51cc58cb86fab01370e84ec9e19a6bf60e8e2
28 changes: 12 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,18 @@

📣 **IMPORTANT NOTE to Fellow Hackers who Have Forked This Repo** 📣

A rebase has been scheduled for this repository. Changes that you have
made may not easily merge after the rebase. However, I will try my best
to preserve the current state of the repository (maybe in an alternate
branch?).

A definitve timeline for the rebase will be given at a later date.

This is to incorporate changes from unexpected pull requests that got
[merged into Alexey's original repo](https://github.com/agalakhov/captdriver/commits/master),
specifically #39 to #45. These PRs add most features that were previously
only available on this fork, along with updates to SPECS and the build
files. However, this fork has diverged enough to make a trivial merge
impossible.

The upcoming rebase aims to restore similarity with the original codebase
and the ability to transfer enhancements and bugfixes between the two repos.
A rebase has been scheduled for this repository, in order to stay in
sync with the [Alexey's orignal repo](https://github.com/agalakhov/captdriver/commits/master)
The rebase will take place on or after **24th June, 2022** UTC.

The following changes will take place:

- [x] The history of the `master` branch as of today will be preserved in `0.1.4-original-history`
- [ ] `0.1.4.1-RE` will become the starting point for future pull request branches
- Please make pull requests to this branch while we are at version 0.1.4.
- [ ] `0.1.4.1-master` will be absorbed back into `master`. Some commits may be squashed.

Please aware of the extra `.1` on the names of the new branches. Thanks a million!

## Foreword
**Captdriver is a free (as in speech) alternative driver** for Canon
Expand Down