From 856ef2dcbf9a952d80f0f83fc53739c9ac922369 Mon Sep 17 00:00:00 2001 From: Ayumi Hamasaki Date: Mon, 12 Aug 2019 16:44:59 +0100 Subject: [PATCH] Add info how to fix the develop branch in CONTRIBUTING.md file (#4542) Credit to @bennothommo & @ayumihamsaki --- .github/CONTRIBUTING.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0988de9772..705be8abc9 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -63,6 +63,28 @@ To help us merge your Pull Request, please make sure you follow these points: Thank you for your contributions! +### How to fix/update your develop branch + +When you see a conflict with the `develop` branch you can do the following to resolve the error. Add the core October repo as a remote (ie. `upstream`) and when working on my own branch, I had to ensure that the changes from the core were included in my fork. + +You could try the following: + +``` +git remote add upstream git@github.com:octobercms/october.git +git fetch upstream +git checkout develop +git pull upstream develop +``` + +This ensures that your local `develop` branch matches October. Then: + +``` +git checkout +git merge develop +``` + +This would merge all the latest changes from the October `develop` branch into your development branch. If there's a merge conflict, this will probably appear on your local copy now, but it should be easy enough to then merge in what you can, and then re-compile the assets using `php artisan october:util compile assets` which should hopefully generate the correct compiled file that won't conflict with October's core repo. + #### PSR Coding standards Please ensure that your Pull Request satisfies the following coding standards: