Test issue

[xxxmicrobexxx]

Ok, here is my test issue

[xxxmicrobexxx]

Righto, my basic problem is so basic...

I have 3 branches, I want to merge cleverreach into main. How do I do that?

Once I have done it, how do I see the previous version of the main branch?

[Fehrox]

Hey Steve,

So it looks like you have the following branches:

1. CleverReach
2. thankyou-email
3. main

The branches CleverReach and thankyou-email are behind main. Lets sit tomorrow or tonight and sort this out together.

All you have to do is decide the order in which you want these to merge, then do so one at a time, and resolve any merge conflicts (a relatively simple process). To help keep things neat I'll show you how to rebase the out-of-date branch onto main once the first one is merged.

This whole thing will actually be really easy, once I show you the basic principles. 👍

See you tonight.

[xxxmicrobexxx]

Thanks. I am at the hospital tomorrow so likely to ight is the go.

…

On Tue, 19 Nov 2024, 15:30 Sebastiaan Fehr, ***@***.***> wrote: Hey Steve, So it looks like you have the following branches: 1. CleverReach 2. thankyou-email 3. main The branches CleverReach and thankyou-email are ahead of main. Lets sit tomorrow or tonight and sort this out together. All you have to do is decide the order in which you want these to merge, then do so one at a time, and resolve any merge conflicts (a relatively simple process). To help keep things neat I'll show you how to rebase the out-of-date branch onto main once the first one is merged. This whole thing will actually be really easy, once I show you the basic principles. 👍 See you tonight. — Reply to this email directly, view it on GitHub <#2 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAIA6SZ47GDTSKMNY3SXFXD2BLEHLAVCNFSM6AAAAABR7M7N3SVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDIOBUG42DEMZSGI> . You are receiving this because you were assigned.[image: Web Bug from https://github.com/notifications/beacon/AAIA6S7D4GOOLCL7DTPUJO32BLEHLA5CNFSM6AAAAABR7M7N3SWGG33NNVSW45C7OR4XAZNMJFZXG5LFINXW23LFNZ2KUY3PNVWWK3TUL5UWJTUUDIULE.gif]Message ID: ***@***.***> [ { ***@***.***": "http://schema.org", ***@***.***": "EmailMessage", "potentialAction": { ***@***.***": "ViewAction", "target": " #2 (comment)", "url": " #2 (comment)", "name": "View Issue" }, "description": "View this Issue on GitHub", "publisher": { ***@***.***": "Organization", "name": "GitHub", "url": " https://github.com" } } ]