Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Conversation

@msfjarvis
Copy link
Member

@msfjarvis msfjarvis commented Jul 27, 2020

📢 Type of change

  • Bugfix
  • New feature
  • Enhancement
  • Refactoring
  • Dependency updates

📜 Description

Adds a configuration option to set the repository branch and wires in the migration flow to make
the switch locally.

💡 Motivation and Context

In accordance with our policy to only resolve issues once they are 3 years old (I jest), this PR
fixes #298.

💚 How did you test it?

Created a new branch in my remote repository, changed the setting to match it and then confirmed that
the reset to remote operation correctly switched me to it.

📝 Checklist

  • I formatted the code with the IDE's reformat action (Ctrl + Shift + L/Cmd + Shift + L)
  • I reviewed submitted code
  • I added a CHANGELOG entry if applicable

🔮 Next steps

This is going to need some sort of onboarding flow, perhaps redirecting users to a wiki page?

📸 Screenshots / GIFs

Screenshot

Git Server Config screen

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
@msfjarvis msfjarvis added this to the 1.11.0 milestone Jul 27, 2020
* develop:
  Disable Autofill compatibility for Firefox (#976)
@msfjarvis
Copy link
Member Author

The things that are up for discussion here:

  1. Onboarding flow - how does that work?
  2. Current migration strategy - is it enough?

* develop:
  PasswordFragment: bring back dividers (#980)
* develop:
  github: fix derp in PSL update workflow (#983)
  Fix TOTP import button check semantics (#982)
@fmeum
Copy link
Member

fmeum commented Jul 29, 2020

The things that are up for discussion here:

  1. Onboarding flow - how does that work?
  2. Current migration strategy - is it enough?

I would personally always do something like this using actual git. I could then simply delete my PS repo and clone with the new branch name set. Unless I'm missing something here, I would say we don't need additional logic/onboarding.

@msfjarvis
Copy link
Member Author

The things that are up for discussion here:

  1. Onboarding flow - how does that work?
  2. Current migration strategy - is it enough?

I would personally always do something like this using actual git. I could then simply delete my PS repo and clone with the new branch name set. Unless I'm missing something here, I would say we don't need additional logic/onboarding.

Hm yeah I guess you're right about.

@msfjarvis msfjarvis merged commit 017abd0 into android-password-store:develop Jul 29, 2020
@msfjarvis msfjarvis deleted the feature/custom-branch branch July 30, 2020 14:27
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Support synchronizing to a git branch besides master

2 participants