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

Don´t stop switch if all changes coincide with live changes #168

Closed
ArneBachmann opened this Issue Feb 6, 2018 · 3 comments

Comments

1 participant
@ArneBachmann
Owner

ArneBachmann commented Feb 6, 2018

Currently the output looks like switch was OK, but has a message to use --force instead
Simply remove all matches between current file tree changes and the ones coming in from switch (or update)

@ArneBachmann ArneBachmann added this to the Future milestone Feb 6, 2018

@ArneBachmann ArneBachmann self-assigned this Feb 6, 2018

@ArneBachmann ArneBachmann modified the milestones: Future, 1.3 Feb 6, 2018

@ArneBachmann

This comment has been minimized.

Owner

ArneBachmann commented Feb 7, 2018

Problem is that exitOnChanges will exit before switch has a chance to compare changsets, but using --force would solve the problem

@ArneBachmann

This comment has been minimized.

Owner

ArneBachmann commented Feb 7, 2018

But what would be the rules?

  • Local addition vs. remote add/remove is a potential conflict
  • Local modification vs. remote add/remove is a conflict
  • Local deletion can always be ignored
@ArneBachmann

This comment has been minimized.

Owner

ArneBachmann commented Feb 7, 2018

Have a partial workaround in place, but having local additions needs per-file comparison to remove conflict

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment