Improve sync script

[barmac]

• [x] Change merge strategy to squash
• [ ] Fetch only a single tag or branch from upstream repository, cf. https://stackoverflow.com/questions/45338495/fetch-a-single-tag-from-remote-repository

This is not implemented as I couldn't set it up correctly together with git merge (fetch with --no-tags made it impossible to refer to the tag later).

• [x] Make sure to remove upstream tags and branches after sync regardless if it was successful or not

This apparently works correctly after update of simple-git.

Which issue does this PR address?

Closes #247

Definition of Done

• [ ] corresponds to the design principles
• [ ] corresponds to the code standards
• [ ] passes Continuous Integration checks
• [ ] available as feature branch on GitHub
  • [ ] contains the cleaned up commit history
  • [ ] commit messages satisfy our commit message guidelines
  • [ ] a single commit closes the issue via Closes #issuenr

[pinussilvestrus]

Fetch only a single tag or branch from upstream repository

I guess this is not so urgent anymore since we make sure to delete all un-related tags afterward in any case?

I'd be fine to move this item into another issue which we might fix in the future then.

[barmac]

I've run a test sync on my machine and there were no Camunda Modeler tags present afterwards.

I believe the problem occurs only when you already have a Camunda Modeler remote configured when you run the sync script. Do you think it's reasonable to remove the remote configuration in that case?

[pinussilvestrus]

I'd say it's cleaner to make sure you always have a fresh remote configuration when executing the sync. Therefore it makes sense, in case you have the remote already present, to delete and re-create it.

[barmac]

Ok, then I'll add a cleanup of the tags before sync is run.

[barmac]

Ready for review.

[barmac]

I don't think it's necessary as we perform a full cleanup now.

[pinussilvestrus]

🚀 Thanks for improving the kind of outdated sync script 👍

[barmac]

I think there's still room for improvement when it comes to the ignored files. I'll have another issue for that.