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.

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

can't call run() method with params from commands migrations. #1431

Merged
merged 2 commits into from
Nov 9, 2018
Merged

can't call run() method with params from commands migrations. #1431

merged 2 commits into from
Nov 9, 2018

Conversation

bangbangda
Copy link
Contributor

Description

Checklist:

  • Securely signed commits
  • Component(s) with PHPdocs
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@samsonasik
Copy link
Member

samsonasik commented Nov 8, 2018

@bangbangda I think it will be tidier to use rebase instead for syncing with latest develop, you can do the following step if you already has the commit:

  1. Backup your change commit by create local new temporary branch based on current branch ("command-migrations", for example, named "temp-command-migrations"
git checkout -b temp-command-migrations
  1. Back to develop branch and pull latest changes:
git checkout develop && git pull https://github.com/bcit-ci/CodeIgniter4.git develop
  1. Back to "command-migrations" branch and delete latest 2 commit
git checkout command-migrations && git reset --hard HEAD~2
  1. Cherry pick your commit from "temp-command-migrations" branch
git cherry-pick 43f1e448ee86a85acdeb522f6429ac5712b94557
  1. Rebase against develop
git rebase develop

On this stage, you may got conflict, you can fix the conflict with steps:

a. Fix the conflict ( don't add new commit for fixing its conflict only )
b. Run git add .

git add .

c. Re-continue git rebase :

git rebase --continue
  1. Finally, you need to force-push to your fork repository:
git push --force origin command-migrations
  1. Now, you're save to delete temporary branch
git branch -D temp-command-migrations

I created a blog post for it https://samsonasik.wordpress.com/2015/09/16/practical-git-4-rebasing-conflicted-task-branch-against-primary-branch/

@bangbangda
Copy link
Contributor Author

Thank you very much. I understand and will try it. @samsonasik

@lonnieezell lonnieezell merged commit 4d74f4d into codeigniter4:develop Nov 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants