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.

Sign up for GitHub

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

Jump to bottom

List issues with rebasing in README Caveats / Limitations #67

Closed
Erotemic opened this issue Aug 15, 2019 · 2 comments
Closed

List issues with rebasing in README Caveats / Limitations #67

Erotemic opened this issue Aug 15, 2019 · 2 comments

Comments

@Erotemic
Copy link

I think it important to be more upfront about issues with rebasing like those brought up in #8. These limitations should be clearly stated in the README, so fools like myself don't almost push all their secrets in plaintext.
@jmurty jmurty mentioned this issue Apr 7, 2020
Closed
@jmurty
Copy link
Collaborator

jmurty commented Apr 25, 2020

I'm pretty confident that the underlying merge issue is fixed in the pending PR #76 that adds a merge driver to better handle conflicts that occur during rebasing, or merging in general.

@jmurty
Copy link
Collaborator

jmurty commented Jun 2, 2020

The merge and rebase problems should be solved by PR #76 which is now merged to the master branch and will be included in the next release.

@jmurty jmurty closed this as completed Jun 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@jmurty @Erotemic