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

Fix conflict by merging from master to dev #108

Merged
merged 5 commits into from
Sep 14, 2024
Merged

Fix conflict by merging from master to dev #108

merged 5 commits into from
Sep 14, 2024

Conversation

Hlavtox
Copy link
Contributor

@Hlavtox Hlavtox commented Sep 13, 2024

Questions Answers
Description? There is some weird conflict when doing a release, this should fix it.
Type?
BC breaks?
Deprecations?
Fixed ticket?
Sponsor company
How to test?

Progi1984 and others added 5 commits June 1, 2020 15:57
@Progi1984
Merge pull request #51 from PrestaShop/dev
52e9d1a 
Release 3.1.0
@Progi1984
Merge pull request #72 from PrestaShop/dev
ffc0818 
Release 3.1.1
@SharakPL
Merge pull request #82 from PrestaShop/dev
c5980fe 
Release version 3.1.2
@nicosomb
Merge pull request #87 from PrestaShop/dev
36f848c 
Release 3.1.3
@tblivet @JoseNOM
@matks @leemyongpakvn @kpodemski @florine2623 @Hlavtox @ga-devfront
Release 3.1.4 (#98)
25c8674 
* Remove useless Google Analytics parameters

* Delete PULL_REQUEST_TEMPLATE.md

* Update build-release.yml

* Update README.md

* Update README.md

* feat: remove mobile desactivation

* Release 3.1.4

---------

Co-authored-by: JoseNOM <[email protected]>
Co-authored-by: Mathieu Ferment <[email protected]>
Co-authored-by: leemyongpakvn <[email protected]>
Co-authored-by: Krystian Podemski <[email protected]>
Co-authored-by: florine2623 <[email protected]>
Co-authored-by: Daniel Hlavacek <[email protected]>
Co-authored-by: Guyomar Alexis <[email protected]>
@matks
Copy link
Contributor

matks commented Sep 13, 2024

@Hlavtox Conflicts again, which is logical.

In order to solve this problem, what you must do is

  • on your localhost, fetch dev branch and create a branch lalala
  • then merge master in lalala ON YOUR LOCALHOST -> git will ask you fix the conflicts
  • then make a PR to merge lalala in dev

This is how we also do branch merges on prestashop/prestashop

@ShaiMagal ShaiMagal merged commit 84c42a6 into dev Sep 14, 2024
20 checks passed
@Hlavtox Hlavtox mentioned this pull request Sep 15, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matks matks matks approved these changes

Assignees
No one assigned
Labels
None yet
Projects
PR Dashboard
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@Hlavtox @matks @ShaiMagal @ps-jarvis @Progi1984 @SharakPL @nicosomb @tblivet