Reply to thread

Message

hmm - maybe I understood the request wrong

The directory structures of the two branches are different, therefore a merge makes no sense.

What I can do is to implement my changes in this EXP-TV3.5_MP_NET4 branch once again.
But then then FEAT-3273-Switch_to_log4net branch should not be merged to the master. It would be better to delete it.
Or does anybody (with better git skills then me) knows a better solution?

<blockquote data-quote="Bavarian" data-source="post: 916229" data-attributes="member: 12267">hmm <img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" class="smilie smilie--sprite smilie--sprite5" alt=":confused:" title="Confused&nbsp; &nbsp; :confused:" loading="lazy" data-shortname=":confused:" /> - maybe I understood the request wrong&nbsp; <img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" class="smilie smilie--sprite smilie--sprite5" alt=":confused:" title="Confused&nbsp; &nbsp; :confused:" loading="lazy" data-shortname=":confused:" />&nbsp;The directory structures of the two branches are different, therefore a merge makes no sense.&nbsp;What I can do is to implement my changes in this EXP-TV3.5_MP_NET4 branch once again.But then then FEAT-3273-Switch_to_log4net branch should not be merged to the master. It would be better to delete it.Or does anybody (with better git skills then me) knows a better solution?</blockquote>

[QUOTE="Bavarian, post: 916229, member: 12267"] hmm :confused: - maybe I understood the request wrong :confused: The directory structures of the two branches are different, therefore a merge makes no sense. What I can do is to implement my changes in this EXP-TV3.5_MP_NET4 branch once again. But then then FEAT-3273-Switch_to_log4net branch should not be merged to the master. It would be better to delete it. Or does anybody (with better git skills then me) knows a better solution? [/QUOTE]

Verification