search

Talent-Catalog / talentcatalog

https://tctalent.org
GNU Affero General Public License v3.0
13 stars 4 forks source link

Update hot-fixing process #1203

Open sadatmalik opened 3 months ago

sadatmalik commented 3 months ago

As a developer I would like clarity on what I should do if there are merge conflicts when applying the hotfix back into staging Because this is not explicit in the current process

samschlicht commented 1 week ago

Just a note that right after our call I remembered what I'd done to cause the conflicts: while I am in the habit of always updating staging, I had not updated master before submitting my hot fix. Usually this wouldn't necessarily cause an issue, since there's not typically a lot of action on master — but there had been a lot of hot fixes in the preceding days.

So, maybe just a reminder to fetch origin and update master before merging (something that should be obvious but could be useful to be reminded of 🙂).