search

ardanlabs / gotour

Apache License 2.0
100 stars 60 forks source link

Support for having WIP languages without publishing them #240

Closed mdelapenya closed 6 months ago

mdelapenya commented 8 months ago

@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 https://github.com/ardanlabs/gotour/issues/239#issuecomment-1951302787

ardan-bkennedy commented 8 months ago

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.

mdelapenya commented 8 months ago

Indeed, that's what I usually do, see https://github.com/ardanlabs/gotour/pull/239/commits/23e5a00f476730f5c98f8285087cf2edfe417d24. My main concern is not tracking all the changes at once and miss any

ardan-bkennedy commented 8 months ago

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