You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
versioning (major.minor.subversion) that can match release tags
gitflow :
master for releases only (with tags)
develop for PR's and merging into master
feature/hotfix branches (feature-ISSUE-NUMBER_NAME-OF-FEATURE or hotfix-ISSUE-NUMBER_NAME-OF-HOTFIX)
@taylorsmock I want to hear your feedback on this. I'd like to implement this on a smaller project like the validator so we can get used to it and move it the larger repos too.
The text was updated successfully, but these errors were encountered:
I had been intending to standardize filenames as kaart.<GROUP>.validator.mapcss. I just haven't done that yet, since I wanted to make certain I'd be around if something happened. I'd also have to get @andrewcp54 on board with the Dwarf validator. That shouldn't be too much of an issue, since I think they are here on a regular basis and don't have any (currently) scheduled vacations.
I'm absolutely OK with having a develop branch and a master branch. I haven't been doing any actual releases -- I'd want to set up some kind of CI first, to make certain things aren't broken. I would also want to add it to the list of mapcss validators in JOSM (so we don't have to copy-paste the URL).
Feature and hotfix branches should be OK. I prefer rebasing to merging though (I dislike merge commits), so I probably wouldn't be merging the hotfix branches.
I would also have to add to the README. I'd probably specify that develop may be regenerated at any time (merge to master, delete develop, create develop, have people wonder why develop is having issues).
I do want to add versioning back. I'll see if I can modify the script to get the number of revisions for each compiled file, and use that. Sometime.Version numbers are now automatically obtained with the make.py file, using the number of versions each release file has had along with today's date
I'm OK with feature and hotfix branches and maybe a development branch specific to each team (for testing), but I'd rather set up a bot to check for issues instead.
Let's standardize a few things:
master
for releases only (with tags)develop
for PR's and merging intomaster
feature-ISSUE-NUMBER_NAME-OF-FEATURE
orhotfix-ISSUE-NUMBER_NAME-OF-HOTFIX
)@taylorsmock I want to hear your feedback on this. I'd like to implement this on a smaller project like the validator so we can get used to it and move it the larger repos too.
The text was updated successfully, but these errors were encountered: