[Gambas-user] Mistake on merge request

[Christof Thalhofer]

Hi Gian,

I am unsure if I'm right but you could try this:

Am 10.02.24 um 15:28 schrieb Gianluigi:

> Check out, review, and resolve locally
> 
> Step 1. Fetch and check out this merge request's feature branch:

If you have done this:

> git fetch"https://gitlab.com/GianluigiOr/gambas.git"  'master'
> git checkout -b 'gambas-master' FETCH_HEAD

Then

> Step 2. Review the changes locally.
> 
> Step 3. Resolve any conflicts. How do I fix them?

You can look at the status on the commandline:

git status

It should show you path(s) to file(s) with conflict(s).

In a file with a conflict git should have marked the lines where both 
parts have changed and git could not decide what change is the right 
one. Like so:

> <<<<<<< HEAD
> Change One
> =======
> Change Two
>>>>>>>> your-branch

You can then edit these lines so that only the right one remains:

 > Change Two

Then commit and after that:

> Step 4. Push the source branch up to GitLab.
> 
> git push"https://gitlab.com/GianluigiOr/gambas.git"  'gambas-master:master'

Alles Gute

Christof Thalhofer

-- 
Dies ist keine Signatur

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <http://lists.gambas-basic.org/pipermail/user/attachments/20240211/ba990644/attachment.sig>