Skip to content

Conversation

gcamrit
Copy link

@gcamrit gcamrit commented Sep 18, 2015

No description provided.

@ryan-senn
Copy link

If this pull-request gets accepted, don't forget to replicate it for the MigrationsServiceProvider and AclServiceProvider!

@patrickbrouwers
Copy link
Contributor

Is ->version() available on the Application contract?

@gcamrit
Copy link
Author

gcamrit commented Sep 18, 2015

yes it is available on Application Contract

@patrickbrouwers
Copy link
Contributor

Nice. Can you rebase your commits for me (squash into 1 commit) :)

@gcamrit
Copy link
Author

gcamrit commented Sep 18, 2015

Right now, i don't have my laptop. will it be a problem to do it with 2 commit ?

@patrickbrouwers
Copy link
Contributor

You can select the last to commits with git rebase -i HEAD~2

@gcamrit
Copy link
Author

gcamrit commented Sep 18, 2015

I don't know what am i doing with git .. learning to use it :)

@patrickbrouwers i run that command you gave me and squash my last commit and pushed it

@patrickbrouwers
Copy link
Contributor

Hmm that didn't work out haha :p

Try to follow these steps:

git checkout 1.0
git rebase -i HEAD~4

Change the last 3 commits to f instead of p. Keep the first commit on p.

Close the window (and save the file)

git push -f

Alos what seems to have gone wrong is that you tracked master into 1.0. Make sure you are in the 1.0 branch.

@gcamrit
Copy link
Author

gcamrit commented Sep 20, 2015

Finally it is in one commit now :)

@patrickbrouwers
Copy link
Contributor

Good job, @Amrit01 ! :)

P.S. Only see now that you made the PR to the master branch. These kind of fixes can go to 1.0 . Master is only for breaking changes/big new functionality.

Can you make PR to the 1.0 branches of the other packages to include this fix?

patrickbrouwers added a commit that referenced this pull request Sep 20, 2015
Improved checking if framework is Lumen or not
@patrickbrouwers patrickbrouwers merged commit 36561d1 into laravel-doctrine:master Sep 20, 2015
ToyamaTakayuki added a commit to ToyamaTakayuki/laravel-doctrine that referenced this pull request Feb 4, 2025
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.

4 participants