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

Merge that went wrong? #28071

Closed
mdeweerd opened this issue Feb 8, 2024 · 5 comments · Fixed by #28083
Closed

Merge that went wrong? #28071

mdeweerd opened this issue Feb 8, 2024 · 5 comments · Fixed by #28083
Labels
Bug This is a bug (something does not work as expected)

Comments

@mdeweerd
Copy link
Contributor

mdeweerd commented Feb 8, 2024 •
edited
Loading

Bug

@eldy Sorry for tagging directly, but this concerns a merge

/~https://github.com/Dolibarr/dolibarr/compare/2a28248..854292e

Something went wrong when merging 2a28248 to 854292e .

I double confirmed that this is a direct transition (7db64c5 is the commit just before 2a28248):

$ git rev-list --ancestry-path 7db64c5bcc0..854292ea47d
854292ea47ddb87714fae56e2dc4d338a5dd238f
2a28248dd4e9202d7cadfc9e91de35d29ab16173

I discovered this when I went looking for the reason some changes that I made in PR's went missing in the develop branch.
@mdeweerd mdeweerd added the Bug This is a bug (something does not work as expected) label Feb 8, 2024
@frederic34
Copy link
Member

frederic34 commented Feb 8, 2024 •
edited
Loading

@mdeweerd, ah, thank you for finding my pull requests, I thought I dreamed them 👴🏼
@thibdrev @W1W1-M

@thibdrev thibdrev mentioned this issue Feb 8, 2024
Merged
@thibdrev
Copy link
Contributor

thibdrev commented Feb 8, 2024 •
edited
Loading

Thanks @mdeweerd.
Indeed I was also wondering why phpstan was still throwing a bunch of errors related to getNextValue() while I had patiently corrected them one by one 😃

@mdeweerd mdeweerd mentioned this issue Feb 9, 2024
Merged
@mdeweerd
Copy link
Contributor Author

mdeweerd commented Feb 9, 2024

I managed to put together a script/method to reconstruct a branch that could be proposed as a PR to recover the lost commits.

recover-merge.txt

@mdeweerd
Copy link
Contributor Author

mdeweerd commented Feb 9, 2024 •
edited
Loading

Maybe you ( @frederic34,@thibdrev,@W1W1-M) can help out to make the right decisions on the merge conflicts in #28083 - especially if it concerns code that you updated ?
A PR to my branch redo-1 ? Currently set as the main branch of /~https://github.com/mdeweerd/dolibarr .

@thibdrev
Copy link
Contributor

thibdrev commented Feb 9, 2024

Happy to help but my git knowledge is probably not sufficient.
My PRs shall be relatively simple since they're only phpstan/phpdoc fixes.

eldy added a commit that referenced this issue Feb 9, 2024
@mdeweerd @eldy
@frederic34 @thibdrev @sonikf @LeKarSol @EchoLoGeek @Quentin-Seekness
Fix #28071 - New branch to fix bad merge (#28083)
7b54824 
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Qual: Introduce getDataToShowPhoto to prepare generic code

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix missing trans

* Fix langs

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Remove useless files in web templates

* Clean code

* Fix duplicate translation key

* Fix duplicate translation key

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix duplicate key

* Fix $object

* Debug v19

* WIP SMSing

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* WIP EMAILINGS_SUPPORT_ALSO_SMS

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* WIP SMSing

* Debug the "validate" feature

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Clean code

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Enhance rector to fix empty($user->rights->modulex->perm1)

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Fix template to use v19 dev rules

* Fix use v19 dev rules

* Fix phpunit

* Debug v19

* Clean code

* Use rector to convert user->rights into user->hasRight

* Clean code

* Use rector to convert user->rights into user->hasRight

* Use rector to convert user->rights into user->hasRight

* Clean code

* Fix phpcs

* add editorconfig for sql files (#27999)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* add model_pdf field in llx_ticket-ticket.sql (#27996)

* add model_pdf field in llx_ticket-ticket.sql

* Update 19.0.0-20.0.0.sql

* Update 19.0.0-20.0.0.sql

* Improve wording in README (#27994)

* fix phpstan (#27989)

* fix phpstan

* Update UserRightsToFunction.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Qual: Fix spelling/working in datapolicy translations (#28006)

# Qual: Fix spelling/wording in datapolicy translations

Fixed some spelling and wording in datapolicy translations.

* qual: phpstan for htdocs/ticket/class/ticketstats.class.php (#27986)

htdocs/ticket/class/ticketstats.class.php	98	Parameter #1 $year (string) of method TicketStats::getNbByMonth() should be compatible with parameter $year (int) of method Stats::getNbByMonth()

* Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix user with readonly perm on email template must be able to read.

* Fix doc

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Better message

* Add missing fields in merge of thirdparty

* Debug v19 selection of ticket printer per terminal

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Use constant

* NEW: Adding a recipient on emails sent, change status to sent partialy.

* fix travis (#28052)

* fix travis

* Update partnership.class.php

* fix php doc (#28047)

* fix undefined array key (#28048)

* Add region and departament for Cuba (#28046)

* Update llx_10_c_regions.sql

Add Cuba Regions (id_country=77)

* Update llx_20_c_departements.sql

Add Provinces Cuba (id country=77)

* Find the typo (#28050)

* Find the typo

* clean code

* add last_main_doc field to product (#28045)

* add las_main_doc field to product

* add field fetch

* NEW Add Categorie filter for ActionComm (#28041)

* New Add Categorie filter for ActionComm

New Add Categorie filter for ActionComm

* Fix space errors

Fix space errors

* Fix space errors 2

Fix space errors 2

* Update cunits.class.php (#28056)

FIX: error SQL when creating a Cunit

* Update codespell-lines-ignore.txt to avoid PR merge conflict

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: thibdrev <thibault.drevet@gmail.com>
Co-authored-by: sonikf <93765174+sonikf@users.noreply.github.com>
Co-authored-by: Ikarus <44511582+LeKarSol@users.noreply.github.com>
Co-authored-by: Anthony Damhet <73399671+EchoLoGeek@users.noreply.github.com>
Co-authored-by: Quentin-Seekness <72733832+Quentin-Seekness@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
Bug This is a bug (something does not work as expected)
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Fix #28071 - New branch to fix bad merge mdeweerd/dolibarr
3 participants
@mdeweerd @frederic34 @thibdrev