Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct the merge with v4.4 #70

Open
janmandel opened this issue May 31, 2023 · 2 comments
Open

Correct the merge with v4.4 #70

janmandel opened this issue May 31, 2023 · 2 comments
Assignees
@janmandel
Labels
needstesting Done but needs regression testing

Comments

@janmandel
Copy link
Member

janmandel commented May 31, 2023 •
edited
Loading

share/landread.c modified in 4c9bccd "Merge tag 'v4.4' into develop-39" #39
A group of lines was deleted and few replaced in a coherent manner.
Both parents 7a0e87f + c11bb76 of 4c9bccd have the same file share/landread.c but after the merge it is different.
janmandel added a commit that referenced this issue May 31, 2023
@janmandel
fixing share/landread.c modified in 4c9bccd Merge tag 'v4.4' into dev…
4012ae1 
…elop-39 #39

both parents of 4c9bccd have the same share/landread.c but after the merge it is different #70
janmandel added a commit that referenced this issue Jun 4, 2023
@janmandel
compiles and runs #70
a88cd9b
@Fergui Fergui changed the title correct the merge with v4.4 Correct the merge with v4.4 Jun 26, 2023
@Fergui Fergui added the needstesting Done but needs regression testing label Jun 26, 2023
@Fergui
Copy link
Member

Fergui commented Jun 26, 2023

Needs review @janmandel

@Aurel31
Copy link
Collaborator

Aurel31 commented Jan 23, 2024

@janmandel What is the status of this issue with the new release?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@janmandel janmandel

Labels
needstesting Done but needs regression testing
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@janmandel @Fergui @Aurel31