#!/bin/bash cd /usr/src/libreoffice cd office-gobmx/ git branch git checkout master git pull git checkout upstream git pull git checkout office-gobmx git pull git checkout merge-office-gobmx git log --oneline --graph # * 3bdfa25eebcd (HEAD -> merge-office-gobmx) Merge branch 'merge-features-LO' into merge-office-gobmx # |\ # | * a1ddf9127cbf (merge-features-LO) Corregida instrucción de descarga # | * eae787411b4d Modificado archivo tar xz a gz # | * 7435ee002391 Fonts added # | * e07c2005f6a7 Fuentes monserrat y gmx # | * 38e2537e17e4 Modificacion al build y borrado UPDATEURL # | * 8cce9ed454c0 Archivos de distro-config de brand Office # | * 5f7c01a69216 Custom images and referencies added # * | f4f17a292b13 Merge branch 'office-gobmx' into merge-office-gobmx # |\ \ # | * | 6dd3de980fae (origin/test-win11, origin/master, origin/HEAD, office-gobmx) Custom images and referencies added # * | | a5f3d80dbd05 Modificacion al build y borrado UPDATEURL # * | | f257c9faa1c7 Archivos de distro-config de brand Office # * | | befaca4b8f53 Custom images and referencies added # | |/ # |/| # * | 42364fbfafaa tdf#104918 Add Firebird's DATEDIFF syntax to the sql parser # * | 616c1da0cc8b Fix typos git rebase upstream # dropping 6dd3de980fae66d02f30e99276bb5857e8fd543f Custom images and referencies added -- patch contents already upstream # dropping 5f7c01a69216f382b6cd07d5c5321a27a4fe6350 Custom images and referencies added -- patch contents already upstream # dropping 8cce9ed454c0d12925031772ec5f6ae4d38d96d3 Archivos de distro-config de brand Office -- patch contents already upstream # dropping 38e2537e17e4da4aa601b1f046649e70622385a5 Modificacion al build y borrado UPDATEURL -- patch contents already upstream # Successfully rebased and updated refs/heads/merge-office-gobmx. git log --oneline --graph # * e6c56cf96e02 (HEAD -> merge-office-gobmx) Corregida instrucción de descarga # * 486586c643f1 Modificado archivo tar xz a gz # * 0c08dfe318b7 Fonts added # * e652e8d4919a Fuentes monserrat y gmx # * d40798b3836b Modificacion al build y borrado UPDATEURL # * af8dbc35b9f3 Archivos de distro-config de brand Office # * 7bd6075d04d2 Custom images and referencies added # * 34d32740d898 (gerrit/master, upstream) on invalidating other views, specific what Tab is invalidated # * a35311beef37 for LibreOfficeKit::isActive we can skip to LogicInvalidate git merge office-gobmx # Merge made by the 'ort' strategy. # custom_images/about.svg | 2516 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # custom_images/logo.svg | 1 + # fonts/gmx-fonts.tar.gz | Bin 0 -> 2409292 bytes # 3 files changed, 2517 insertions(+) # create mode 100644 custom_images/about.svg # create mode 100644 custom_images/logo.svg # create mode 100644 fonts/gmx-fonts.tar.gz git log --oneline --graph # * 32e6b8531261 (HEAD -> merge-office-gobmx) Merge branch 'office-gobmx' into merge-office-gobmx # |\ # | * 2c08276498f4 (origin/office-gobmx, office-gobmx) Merge branch 'ipar/features-LO' into 'office-gobmx' # | |\ # | | * 4d471b7edb71 Merge branch 'logos' into 'ipar/features-LO' # | | |\ # | | | * d03adba81b37 logo image updated # | | | * 8d8ef5d2dcaa Restauracion link repos/src # | | | * effe4847a786 (origin/logos, logos) Modificado link de descarga de fuentes # | | | * f7f97c6f3bdd Cambios en logo # | | |/ # | | * 4c5250184feb (origin/ipar/features-LO, ipar/features-LO) Corregida instrucción de descarga # | | * df95e5c7691a Modificado archivo tar xz a gz # | | * 3b93cbfa68e6 Merge branch 'fonts' into 'ipar/features-LO' # | | |\ # | | | * 8f903a611d09 (origin/fonts, fonts) Fonts added # | | |/ # | |/| # | | * b81b8d03d6e6 Fuentes monserrat y gmx # | | * f8f77d53f46c Merge branch 'master' into 'ipar/features-LO' # | | |\ # | | |/ # | |/| # | * | 6dd3de980fae (origin/test-win11, origin/master, origin/HEAD) Custom images and referencies added # | | * bc323d264231 Modificacion al build y borrado UPDATEURL # | | * d9e88050c6af Archivos de distro-config de brand Office # * | | e6c56cf96e02 Corregida instrucción de descarga # * | | 486586c643f1 Modificado archivo tar xz a gz # * | | 0c08dfe318b7 Fonts added # * | | e652e8d4919a Fuentes monserrat y gmx # * | | d40798b3836b Modificacion al build y borrado UPDATEURL # * | | af8dbc35b9f3 Archivos de distro-config de brand Office # * | | 7bd6075d04d2 Custom images and referencies added # * | | 34d32740d898 (gerrit/master, upstream) on invalidating other views, specific what Tab is invalidated # * | | a35311beef37 for LibreOfficeKit::isActive we can skip to LogicInvalidate git branch # Sandino/2023-07-08 # fonts # ipar/features-LO # logos # master # merge-features-LO # merge-fonts # merge-logos #* merge-office-gobmx # office-gobmx # office-gobmx-7.4.5.1 # office-gobmx-7.4.7.2 # office-gobmx-7.5-branch # office-gobmx-7.5.4.2 # office-gobmx-7.6.0.1 # ofiice-gobmx-7.4-001-custom-images # ofiice-gobmx-7.4-branch # test-logos-7.5 # test-logos-7.5.5.1 # test-logos-7.5.5.2 # test-office-gobmx # upstream git checkout -b backport-gobmx-7.5 # Switched to a new branch 'backport-gobmx-7.5' git checkout office-gobmx-7.5-branch git log --oneline --graph # * 9716480d7f84 (HEAD -> office-gobmx-7.5-branch, origin/office-gobmx-7.5-branch) Modificacion al build y borrado UPDATEURL # * 25e8fddddd42 Archivos de distro-config de brand Office # * cf4545f2ac1e Custom images and referencies added # * 77cd3d7ad444 (tag: libreoffice-7.5.0.1) Version 7.5.0.1, tag libreoffice-7.5.0.1 # * 2d7fb3cd1181 bump product version to 7.5.0.1 # https://git-scm.com/book/en/v2/Git-Branching-Rebasing git rebase --onto libreoffice-7.5.0.1 upstream backport-gobmx-7.5 # Auto-merging cui/source/dialogs/about.cxx # CONFLICT (content): Merge conflict in cui/source/dialogs/about.cxx # error: could not apply 7bd6075d04d2... Custom images and referencies added vi cui/source/dialogs/about.cxx # merge de 1 línea (la que se borra es <<<< HEAD) # <<<<<<< HEAD # if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) { # ======= # if (SfxApplication::loadBrandSvg("shell/MexGob", aBackgroundBitmap, nWidth * 0.9)) { # >>>>>>> 7bd6075d04d2 (Custom images and referencies added) git add cui/source/dialogs/about.cxx git rebase --continue # Auto-merging Makefile.fetch # CONFLICT (content): Merge conflict in Makefile.fetch # error: could not apply b81b8d03d6e6... Fuentes monserrat y gmx vi Makefile.fetch # merge de 1 línea (la que se borra es <<<< HEAD) git add Makefile.fetch git rebase --continue # Successfully rebased and updated refs/heads/backport-gobmx-7.5. git branch # Sandino/2023-07-08 # * backport-gobmx-7.5 # fonts git log --oneline --graph # * c3a14c4d09ec (HEAD -> backport-gobmx-7.5) logo image updated # * f1b40f9a1eb5 Restauracion link repos/src # * 7f17590772d9 Modificado link de descarga de fuentes # * 0898ab93b686 Cambios en logo # * 059d798a2888 Corregida instrucción de descarga # * 25a576d62436 Fuentes monserrat y gmx # * a04e1f43871f Corregida instrucción de descarga # * 2c6d262d1693 Modificado archivo tar xz a gz # * 52809ef04bee Fonts added # * 3e78de880e79 Fuentes monserrat y gmx # * fca537bb124e Modificacion al build y borrado UPDATEURL # * c7e521fdf24f Archivos de distro-config de brand Office # * 60dbf3b96d0e Custom images and referencies added # * 77cd3d7ad444 (tag: libreoffice-7.5.0.1) Version 7.5.0.1, tag libreoffice-7.5.0.1 # * 2d7fb3cd1181 bump product version to 7.5.0.1 git checkout office-gobmx-7.5.4.2 git log --oneline --graph # * f983157cbec6 (HEAD -> office-gobmx-7.5.4.2, origin/office-gobmx-7.5.4.2) Modificacion al build y borrado UPDATEURL # * 447616056e24 Archivos de distro-config de brand Office # * a1890cbcb03a Custom images and referencies added # * 36ccfdc35048 (tag: libreoffice-7.5.4.2) Version 7.5.4.2, tag libreoffice-7.5.4.2 # * 2a18b6147ac2 bump product version to 7.5.4.2 git checkout backport-gobmx-7.5 git checkout -b backport-gobmx-7.5.4.2 git rebase libreoffice-7.5.4.2 # Auto-merging configure.ac # CONFLICT (content): Merge conflict in configure.ac # error: could not apply 2d7fb3cd1181... bump product version to 7.5.0.1 vi configure.ac # merge de 1 línea (ahora nos quedamos con <<<< HEAD) # <<<<<<< HEAD # AC_INIT([LibreOffice],[7.5.4.2],[],[],[http://documentfoundation.org/]) # ======= # AC_INIT([LibreOffice],[7.5.0.1],[],[],[http://documentfoundation.org/]) # >>>>>>> 2d7fb3cd1181 (bump product version to 7.5.0.1) git add configure.ac git rebase --continue # Failed to merge submodule dictionaries (not checked out) # CONFLICT (submodule): Merge conflict in dictionaries # Failed to merge submodule helpcontent2 (not checked out) # CONFLICT (submodule): Merge conflict in helpcontent2 # Failed to merge submodule translations (not checked out) # CONFLICT (submodule): Merge conflict in translations # Recursive merging with submodules currently only supports trivial cases. git rebase --skip #Successfully rebased and updated refs/heads/backport-gobmx-7.5.4.2. git log --oneline --graph # * ef3a7d5303e6 (HEAD -> backport-gobmx-7.5.4.2) logo image updated # * d8ad1c1944dd Restauracion link repos/src # * 0d0668e29a45 Modificado link de descarga de fuentes # * 0eb95d793d79 Cambios en logo # * 95ee6b3a6cda Corregida instrucción de descarga # * 0d5224ff89e8 Fuentes monserrat y gmx # * 323fc35fe00c Corregida instrucción de descarga # * 2b90813bf084 Modificado archivo tar xz a gz # * 1108dd9775c8 Fonts added # * e7b586fc66a0 Fuentes monserrat y gmx # * 52ef278b6b1f Modificacion al build y borrado UPDATEURL # * 75d0ce7b4694 Archivos de distro-config de brand Office # * dac0ec8a1d1a Custom images and referencies added # * 36ccfdc35048 (tag: libreoffice-7.5.4.2) Version 7.5.4.2, tag libreoffice-7.5.4.2 # * 2a18b6147ac2 bump product version to 7.5.4.2 git checkout office-gobmx-7.5.4.2 git merge backport-gobmx-7.5.4.2 # Merge made by the 'ort' strategy. # .git-hooks/pre-commit | 2 +- # Makefile.fetch | 4 + # Repository.mk | 1 + # custom_images/about.svg | 2516 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # custom_images/logo.svg | 1 + # download.lst | 3 + # external/more_fonts/ExternalPackage_gmx.mk | 49 +++ # external/more_fonts/Module_more_fonts.mk | 2 + # external/more_fonts/UnpackedTarball_gmx.mk | 14 + # fonts/gmx-fonts.tar.gz | Bin 0 -> 2409292 bytes # solenv/flatpak-manifest.in | 7 + # 11 files changed, 2598 insertions(+), 1 deletion(-) # create mode 100644 custom_images/about.svg # create mode 100644 custom_images/logo.svg # create mode 100644 external/more_fonts/ExternalPackage_gmx.mk # create mode 100644 external/more_fonts/UnpackedTarball_gmx.mk # create mode 100644 fonts/gmx-fonts.tar.gz git log --oneline --graph # * 839cfb6a57d8 (HEAD -> office-gobmx-7.5.4.2) Merge branch 'backport-gobmx-7.5.4.2' into office-gobmx-7.5.4.2 # |\ # | * ef3a7d5303e6 (backport-gobmx-7.5.4.2) logo image updated # | * d8ad1c1944dd Restauracion link repos/src # | * 0d0668e29a45 Modificado link de descarga de fuentes # | * 0eb95d793d79 Cambios en logo # | * 95ee6b3a6cda Corregida instrucción de descarga # | * 0d5224ff89e8 Fuentes monserrat y gmx # | * 323fc35fe00c Corregida instrucción de descarga # | * 2b90813bf084 Modificado archivo tar xz a gz # | * 1108dd9775c8 Fonts added # | * e7b586fc66a0 Fuentes monserrat y gmx # | * 52ef278b6b1f Modificacion al build y borrado UPDATEURL # | * 75d0ce7b4694 Archivos de distro-config de brand Office # | * dac0ec8a1d1a Custom images and referencies added # * | f983157cbec6 (origin/office-gobmx-7.5.4.2) Modificacion al build y borrado UPDATEURL # * | 447616056e24 Archivos de distro-config de brand Office # * | a1890cbcb03a Custom images and referencies added # |/ # * 36ccfdc35048 (tag: libreoffice-7.5.4.2) Version 7.5.4.2, tag libreoffice-7.5.4.2 # * 2a18b6147ac2 bump product version to 7.5.4.2 git push # To git.softwarelibre.mx:strepsirrhini/office-gobmx.git # f983157cbec6..839cfb6a57d8 office-gobmx-7.5.4.2 -> office-gobmx-7.5.4.2 git tag | grep libreoffice-7.5 # libreoffice-7-5-branch-point # libreoffice-7.5.0.0.alpha1 # libreoffice-7.5.0.0.beta1 # libreoffice-7.5.0.1 # libreoffice-7.5.0.2 # libreoffice-7.5.0.3 # libreoffice-7.5.1.1 # libreoffice-7.5.1.2 # libreoffice-7.5.2.1 # libreoffice-7.5.2.2 # libreoffice-7.5.3.1 # libreoffice-7.5.3.2 # libreoffice-7.5.4.1 # libreoffice-7.5.4.2 # libreoffice-7.5.5.1 git checkout upstream git checkout libreoffice-7.5.5.1 git checkout -b office-gobmx-7.5.5.1 git log --oneline --graph # * 2c5e46c1980e (HEAD -> office-gobmx-7.5.5.1, tag: libreoffice-7.5.5.1) Version 7.5.5.1, tag libreoffice-7.5.5.1 # * 1aebdd74e1ea bump product version to 7.5.5.1 # * d0e9744e48cf Branch libreoffice-7-5-5 git checkout backport-gobmx-7.5.4.2 git log --oneline --graph git checkout -b backport-gobmx-7.5.5.1 git rebase libreoffice-7.5.5.1 # Auto-merging .gitreview # CONFLICT (content): Merge conflict in .gitreview # Failed to merge submodule dictionaries (not checked out) # CONFLICT (submodule): Merge conflict in dictionaries # Failed to merge submodule helpcontent2 (not checked out) # CONFLICT (submodule): Merge conflict in helpcontent2 # Failed to merge submodule translations (not checked out) # CONFLICT (submodule): Merge conflict in translations vi .gitreview # merge de 1 línea (ahora nos quedamos con <<<< HEAD) # <<<<<<< HEAD # defaultbranch=libreoffice-7-5-5 # ======= # defaultbranch=libreoffice-7-5-4 # >>>>>>> 80f8211a86b2 (Branch libreoffice-7-5-4) git add .gitreview git rebase --continue # dictionaries: needs merge # helpcontent2: needs merge # translations: needs merge # You must edit all merge conflicts and then # mark them as resolved using git add git rebase --skip # Auto-merging configure.ac # CONFLICT (content): Merge conflict in configure.ac # error: could not apply 0545bb2635ed... bump product version to 7.5.4.1.0+ vi configure.ac # merge de 1 línea (ahora nos quedamos con <<<< HEAD) # <<<<<<< HEAD # AC_INIT([LibreOffice],[7.5.5.1],[],[],[http://documentfoundation.org/]) # ======= # AC_INIT([LibreOffice],[7.5.4.1.0+],[],[],[http://documentfoundation.org/]) # >>>>>>> 0545bb2635ed (bump product version to 7.5.4.1.0+) git add configure.ac git rebase --continue # Failed to merge submodule translations (not checked out) # CONFLICT (submodule): Merge conflict in translations git rebase --skip # Auto-merging configure.ac # CONFLICT (content): Merge conflict in configure.ac # error: could not apply 2a18b6147ac2... bump product version to 7.5.4.2 vi configure.ac # merge de 1 línea (ahora nos quedamos con <<<< HEAD) # <<<<<<< HEAD # AC_INIT([LibreOffice],[7.5.5.1],[],[],[http://documentfoundation.org/]) # ======= # AC_INIT([LibreOffice],[7.5.4.2],[],[],[http://documentfoundation.org/]) # >>>>>>> 2a18b6147ac2 (bump product version to 7.5.4.2) git add configure.ac git rebase --continue #Failed to merge submodule dictionaries (not checked out) #CONFLICT (submodule): Merge conflict in dictionaries #Failed to merge submodule helpcontent2 (not checked out) #CONFLICT (submodule): Merge conflict in helpcontent2 #Failed to merge submodule translations (not checked out) #CONFLICT (submodule): Merge conflict in translations #Recursive merging with submodules currently only supports trivial cases. git rebase --skip #Successfully rebased and updated refs/heads/backport-gobmx-7.5.5.1. git log --oneline --graph # * 834913d296fe (HEAD -> backport-gobmx-7.5.5.1) logo image updated # * af9834b0d961 Restauracion link repos/src # * add6a95dbdaf Modificado link de descarga de fuentes # * a532c3217d12 Cambios en logo # * 512a322aa72f Corregida instrucción de descarga # * ed08ea286b25 Fuentes monserrat y gmx # * 684bdc893345 Corregida instrucción de descarga # * dd12ecc76930 Modificado archivo tar xz a gz # * 7357239b4e14 Fonts added # * 6530a88db69f Fuentes monserrat y gmx # * 70709c6186a6 Modificacion al build y borrado UPDATEURL # * 38db47a28ad0 Archivos de distro-config de brand Office # * 342bd97085b9 Custom images and referencies added # * 2c5e46c1980e (tag: libreoffice-7.5.5.1, office-gobmx-7.5.5.1) Version 7.5.5.1, tag libreoffice-7.5.5.1 # * 1aebdd74e1ea bump product version to 7.5.5.1 # * d0e9744e48cf Branch libreoffice-7-5-5 git checkout office-gobmx-7.5.5.1 git merge backport-gobmx-7.5.5.1 # Updating 2c5e46c1980e..834913d296fe # Fast-forward # .git-hooks/pre-commit | 2 +- # Makefile.fetch | 4 + # Repository.mk | 1 + # cui/source/dialogs/about.cxx | 5 +- # custom_images/MexGob.svg | 2516 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # custom_images/about.svg | 2516 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # custom_images/logo.svg | 1 + # distro-configs/OfficeLinux.conf | 10 + # distro-configs/OfficeWin64.conf | 24 ++ # download.lst | 3 + # external/more_fonts/ExternalPackage_gmx.mk | 49 +++ # external/more_fonts/Module_more_fonts.mk | 2 + # external/more_fonts/UnpackedTarball_gmx.mk | 14 + # fonts/gmx-fonts.tar.gz | Bin 0 -> 2409292 bytes # instsetoo_native/util/openoffice.lst.in | 73 ++++ # solenv/flatpak-manifest.in | 7 + # 16 files changed, 5223 insertions(+), 4 deletions(-) # create mode 100644 custom_images/MexGob.svg # create mode 100644 custom_images/about.svg # create mode 100644 custom_images/logo.svg # create mode 100644 distro-configs/OfficeLinux.conf # create mode 100644 distro-configs/OfficeWin64.conf # create mode 100644 external/more_fonts/ExternalPackage_gmx.mk # create mode 100644 external/more_fonts/UnpackedTarball_gmx.mk # create mode 100644 fonts/gmx-fonts.tar.gz git log --oneline --graph # * 834913d296fe (HEAD -> office-gobmx-7.5.5.1, backport-gobmx-7.5.5.1) logo image updated # * af9834b0d961 Restauracion link repos/src # * add6a95dbdaf Modificado link de descarga de fuentes # * a532c3217d12 Cambios en logo # * 512a322aa72f Corregida instrucción de descarga # * ed08ea286b25 Fuentes monserrat y gmx # * 684bdc893345 Corregida instrucción de descarga # * dd12ecc76930 Modificado archivo tar xz a gz # * 7357239b4e14 Fonts added # * 6530a88db69f Fuentes monserrat y gmx # * 70709c6186a6 Modificacion al build y borrado UPDATEURL # * 38db47a28ad0 Archivos de distro-config de brand Office # * 342bd97085b9 Custom images and referencies added # * 2c5e46c1980e (tag: libreoffice-7.5.5.1) Version 7.5.5.1, tag libreoffice-7.5.5.1 # * 1aebdd74e1ea bump product version to 7.5.5.1 # * d0e9744e48cf Branch libreoffice-7-5-5 git push --set-upstream origin office-gobmx-7.5.5.1 # To git.softwarelibre.mx:strepsirrhini/office-gobmx.git # * [new branch] office-gobmx-7.5.5.1 -> office-gobmx-7.5.5.1 # branch 'office-gobmx-7.5.5.1' set up to track 'origin/office-gobmx-7.5.5.1'. git diff libreoffice-7.5.5.1 mkdir ../formatpatch-2023-08-18 git format-patch -o ../formatpatch-2023-08-18 libreoffice-7.5.5.1 # ../formatpatch-2023-08-18/0001-Custom-images-and-referencies-added.patch # ../formatpatch-2023-08-18/0002-Archivos-de-distro-config-de-brand-Office.patch # ../formatpatch-2023-08-18/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch # ../formatpatch-2023-08-18/0004-Fuentes-monserrat-y-gmx.patch # ../formatpatch-2023-08-18/0005-Fonts-added.patch # ../formatpatch-2023-08-18/0006-Modificado-archivo-tar-xz-a-gz.patch # ../formatpatch-2023-08-18/0007-Corregida-instrucci-n-de-descarga.patch # ../formatpatch-2023-08-18/0008-Fuentes-monserrat-y-gmx.patch # ../formatpatch-2023-08-18/0009-Corregida-instrucci-n-de-descarga.patch # ../formatpatch-2023-08-18/0010-Cambios-en-logo.patch # ../formatpatch-2023-08-18/0011-Modificado-link-de-descarga-de-fuentes.patch # ../formatpatch-2023-08-18/0012-Restauracion-link-repos-src.patch # ../formatpatch-2023-08-18/0013-logo-image-updated.patch ### backport de la versión 7.6 git tag | grep libreoffice-7.6 # libreoffice-7-6-branch-point # libreoffice-7.6.0.0.alpha1 # libreoffice-7.6.0.0.beta1 # libreoffice-7.6.0.1 git checkout libreoffice-7-6-branch-point git checkout -b office-gobmx-7.6-branch git checkout merge-office-gobmx git checkout -b backport-gobmx-7.6 git rebase --onto libreoffice-7-6-branch-point upstream backport-gobmx-7.6 # Auto-merging cui/source/dialogs/about.cxx # CONFLICT (content): Merge conflict in cui/source/dialogs/about.cxx # error: could not apply 7bd6075d04d2... Custom images and referencies added vi cui/source/dialogs/about.cxx git add cui/source/dialogs/about.cxx git rebase --continue #Auto-merging Makefile.fetch #CONFLICT (content): Merge conflict in Makefile.fetch #error: could not apply b81b8d03d6e6... Fuentes monserrat y gmx vi Makefile.fetch git add Makefile.fetch git rebase --continue # Successfully rebased and updated refs/heads/backport-gobmx-7.6. git log --oneline --graph # * c48759ec23e6 (HEAD -> backport-gobmx-7.6) logo image updated # * df5c1af513f7 Restauracion link repos/src # * 4c4fb6ae341b Modificado link de descarga de fuentes # * 726b88b2aa1d Cambios en logo # * 5d2bff76e124 Corregida instrucción de descarga # * af6a0f5f0b4a Fuentes monserrat y gmx # * c612942b7f46 Corregida instrucción de descarga # * 4d8306149dad Modificado archivo tar xz a gz # * ca753ba3b968 Fonts added # * 495744f62e26 Fuentes monserrat y gmx # * 5c2e7e004997 Modificacion al build y borrado UPDATEURL # * e9ea190ade84 Archivos de distro-config de brand Office # * 6c0439ee4f38 Custom images and referencies added # * 6f227b0dd912 (tag: libreoffice-7-6-branch-point, office-gobmx-7.6-branch) Update git submodules # * 2940fb7d2aba tdf#64830: Don’t require hunspell dictionary for every Arabic locale # * e0a6c730b9fc Update git submodules git checkout office-gobmx-7.6-branch git merge backport-gobmx-7.6 git checkout -b office-gobmx-7.6.0.1 git rebase libreoffice-7.6.0.1 git log --oneline --graph # * ba6ac0cbf319 (HEAD -> office-gobmx-7.6.0.1) logo image updated # * 1ad3e4094f2e Restauracion link repos/src # * f2fddd20beea Modificado link de descarga de fuentes # * c671d19775c6 Cambios en logo # * c249224c123d Corregida instrucción de descarga # * 2a3065395481 Fuentes monserrat y gmx # * 52df24398dfc Corregida instrucción de descarga # * 8ade7f36535f Modificado archivo tar xz a gz # * d8174c2c6a7e Fonts added # * 67d71742de48 Fuentes monserrat y gmx # * bb34bb0c48ed Modificacion al build y borrado UPDATEURL # * 5c707ee188f6 Archivos de distro-config de brand Office # * b49749cab20c Custom images and referencies added # * 776eaf34564c (tag: libreoffice-7.6.0.1) Version 7.6.0.1, tag libreoffice-7.6.0.1 # * f489f1da6dcc bump product version to 7.6.0.1 git push --set-upstream origin office-gobmx-7.6.0.1 mkdir ../formatpatch-2023-08-22-7.6.0.1 git format-patch -o ../formatpatch-2023-08-22-7.6.0.1 libreoffice-7.6.0.1 # ../formatpatch-2023-08-22-7.6.0.1/0001-Custom-images-and-referencies-added.patch # ../formatpatch-2023-08-22-7.6.0.1/0002-Archivos-de-distro-config-de-brand-Office.patch # ../formatpatch-2023-08-22-7.6.0.1/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch # ../formatpatch-2023-08-22-7.6.0.1/0004-Fuentes-monserrat-y-gmx.patch # ../formatpatch-2023-08-22-7.6.0.1/0005-Fonts-added.patch # ../formatpatch-2023-08-22-7.6.0.1/0006-Modificado-archivo-tar-xz-a-gz.patch # ../formatpatch-2023-08-22-7.6.0.1/0007-Corregida-instrucci-n-de-descarga.patch # ../formatpatch-2023-08-22-7.6.0.1/0008-Fuentes-monserrat-y-gmx.patch # ../formatpatch-2023-08-22-7.6.0.1/0009-Corregida-instrucci-n-de-descarga.patch # ../formatpatch-2023-08-22-7.6.0.1/0010-Cambios-en-logo.patch # ../formatpatch-2023-08-22-7.6.0.1/0011-Modificado-link-de-descarga-de-fuentes.patch # ../formatpatch-2023-08-22-7.6.0.1/0012-Restauracion-link-repos-src.patch # ../formatpatch-2023-08-22-7.6.0.1/0013-logo-image-updated.patch