ardanlabs / gotour

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

Support for having WIP languages without publishing them

mdelapenya opened this issue · comments

@ardan-bkennedy I wonder if it's possible to merge a language branch without making it public, so that the changes in the core are applied to that WIP language when they are introduced. Otherwise, we have to go resolving conflicts and keeping track of the changes manually trying not to forget any of them. You know, manually resolving conflicts could lead to mistakes.

Originally posted by @mdelapenya in #239 (comment)

I think you are better off merging main into your branch. I have a set of notes of changes that I have to make when main is merged. I can go through that process at any time.

You should look at your branch as main.

Indeed, that's what I usually do, see 23e5a00. My main concern is not tracking all the changes at once and miss any

Everyone on the team should merge to this branch. Everyone has rights to merge