grafana / sobek

MIT License
122 stars 1 forks source link

Update goja #45

Closed joanlopez closed 1 month ago

joanlopez commented 1 month ago

mstoykov commented 1 month ago

I prefer that you do a merge commit here directly with the master branch from goja.

In this way the next time this code gets changed you don't need to cherry-pick and merge conflict fix changes.

Given how common it is for fixes or even feature additions to touch across multiple places, making it easy to not have merge conflicts seems like a must if we want to do this more.

joanlopez commented 1 month ago

I prefer that you do a merge commit here directly with the master branch from goja.

In this way the next time this code gets changed you don't need to cherry-pick and merge conflict fix changes.

Given how common it is for fixes or even feature additions to touch across multiple places, making it easy to not have merge conflicts seems like a must if we want to do this more.

Sure, of course! Like now? 🤔

mstoykov commented 1 month ago

Yeah and also the "merge pull request" so again .. git can figure out the merge conflict resolution later