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

Better handling for merge error (conflicts), which can happen if we mess manually with the repo, deleting too much stuff, ... #12

Open
maxcmoi89 opened this issue Jan 25, 2019 · 0 comments
Labels
enhancement New feature or request question Further information is requested

Comments

@maxcmoi89
Copy link
Contributor

Regarding this issue, I think it may be better to delete the local repo before each run of the publisher instead of keeping it.

Now it works like this:

  1. Clone repo
  2. Publish htacess
  3. Publish htacess
  4. Publish htacess

I think it would be better like this:

  1. Delete repo folders
  2. Clone repo
  3. Publish htacess
  4. Delete repo folders
  5. Clone repo
  6. Publish htacess

By opting for the second solution we always get a clean state of the git from the remote, which we update locally and push. Then we delete it again and ...
I believe this would fix a lot of errors related to merges, local changes, ... causing problems.
The process would be slower for very huge repos since we would download them each time with the clone, it would improve on a lot of merge issues though.

@maxcmoi89 maxcmoi89 added enhancement New feature or request question Further information is requested labels Jan 28, 2019
@maxcmoi89 maxcmoi89 changed the title Better handling for merge error (conflicts) and stuff, which can happen if we mess manually with the repo, deleting too much stuff. Better handling for merge error (conflicts), which can happen if we mess manually with the repo, deleting too much stuff, ... Jan 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request question Further information is requested
Projects
None yet
Development

No branches or pull requests

1 participant