Open pine3ree opened 6 years ago
@pine3ree as this is an improvement, please target develop
@pine3ree please attempt a rebase - don't merge upstream into your dev branches :)
Hello @Ocramius, I had changed the target branch of the pr from master to develop and resolved a resulting conflict. The files changes tab is now showing the correct changes I previously made for master. Did I do something wrong? kind regards.
@pine3ree ah, that's alright. If you are not familiar with the rebase process, I'll just do it on merge :-)
ok, thank You @Ocramius ! kind regards!
@pine3ree just in case you've other conflicted branch in other/next Pull Request, I made blog post about rebase conflicted branch https://samsonasik.wordpress.com/2015/09/16/practical-git-4-rebasing-conflicted-task-branch-against-primary-branch/
@samsonasik Thank You! that's very kind of You, sir! Regards!
This repository has been closed and moved to laminas/laminas-servicemanager; a new issue has been opened at https://github.com/laminas/laminas-servicemanager/issues/12.
This repository has been moved to laminas/laminas-servicemanager. If you feel that this patch is still relevant, please re-open against that repository, and reference this issue. To re-open, we suggest the following workflow:
git rebase -i origin/{branch}
)
when we are also testing with
! empty()
I believe we can skipisset()
checks, as the execution speed is nearly the same (but it will double for positive isset)