Fix Result of PtrSplit (#53) #54

Open

Bi0T1N wants to merge 1 commit from Bi0T1N/fix_ptrsplit into master

Bi0T1N commented

2020-03-16 20:38:37 +00:00

(Migrated from github.com)

set result of the PtrSplit/Split function

closes #53

set result of the PtrSplit/Split function closes #53

Bi0T1N commented

2020-06-01 10:56:55 +00:00

(Migrated from github.com)

@BeRo1985
Could you have a look on my PR?

@BeRo1985 Could you have a look on my PR?

This pull request has changes conflicting with the target branch.

src/FLRE.pas

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'Fix Result of PtrSplit (#53)' (#54) from Bi0T1N/fix_ptrsplit into master

Merge commit body

Reviewed-on: https://git.rosseaux.net/BeRo1985/flre/pulls/54

Merge pull request 'Fix Result of PtrSplit (#53)' (#54) from Bi0T1N/fix_ptrsplit into master

Reviewed-on: https://git.rosseaux.net/BeRo1985/flre/pulls/54

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin Bi0T1N/fix_ptrsplit:Bi0T1N/fix_ptrsplit

git switch Bi0T1N/fix_ptrsplit

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master

git merge --no-ff Bi0T1N/fix_ptrsplit

git switch Bi0T1N/fix_ptrsplit

git rebase master

git switch master

git merge --ff-only Bi0T1N/fix_ptrsplit

git switch Bi0T1N/fix_ptrsplit

git rebase master

git switch master

git merge --no-ff Bi0T1N/fix_ptrsplit

git switch master

git merge --squash Bi0T1N/fix_ptrsplit