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
Use the new git merge-tree --write-tree as suggested by @kyleam.
Initiate an actual merged and provide tooling to quickly clean up when done.
Both ideas were first presented in #4887. Maybe I judged the first approach to negatively there. If someone thinks about it some more and then still wants to implement it like that, I won't keep them from giving it a try. I myself do not plan to work on either approach any time soon.
reacted with thumbs up emoji reacted with thumbs down emoji reacted with laugh emoji reacted with hooray emoji reacted with confused emoji reacted with heart emoji reacted with rocket emoji reacted with eyes emoji
-
I can see two approaches:
git merge-tree --write-tree
as suggested by @kyleam.Both ideas were first presented in #4887. Maybe I judged the first approach to negatively there. If someone thinks about it some more and then still wants to implement it like that, I won't keep them from giving it a try. I myself do not plan to work on either approach any time soon.
Beta Was this translation helpful? Give feedback.
All reactions