Skip to content

Update JGit and improve the sync algorithm. #3

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
Draft
Kayeeec wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Update JGit and improve the sync algorithm. #3

Kayeeec wants to merge 1 commit into from

Conversation

@Kayeeec
Copy link
Owner

@Kayeeec Kayeeec commented Sep 28, 2021

  • removed the workaround and used the JGit only approach using pull rebase command with a recursive merge strategy that prefers local modification
  • CRITICAL - in this JGit version the HTTPS authentication no longer works
    • suspected JGit bug, further analysis needed,
    • probably affects only private repositories

@Kayeeec Kayeeec self-assigned this Sep 28, 2021
Improved git sync implementation through using a newer JGit library v…
ba1dafa 
…ersion.

- removed the workaround and used the JGit only approach using pull rebase command with a recursive merge strategy that prefers local modification
- CRITICAL - in this JGit version the HTTPS authentication no longer works
   - suspected JGit bug, further analysis needed,
   - probably affects only private repositories
@Kayeeec Kayeeec force-pushed the feature/jgit-use-rebase branch from 7bf9b68 to ba1dafa Compare September 28, 2021 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Kayeeec Kayeeec

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Kayeeec