As of version 2017.3, this has been updated to: Preferences > Editor > Code Style > PHP > (tab) Code Generation > Comment Code > (uncheck) Line comment at first column. If it's enabled there will be one or more change indicators in the gutter of the editor. These will show you where your teammates have made changes compared to your version of the file and even update in real-time as you and your teammates are editing. If you've made a conflicting change you will see the bright red conflict indicator. Here is the description I took at official EAP page of PhpStorm: 'At JetBrains, we believe that to make great tools for developers, we should listen to and involve developers. These conflicts can be uncommitted local changes you have not pushed yet or existing changes on your branch that conflict with your teammates’ changes.Ĭlick your teammate’s icon in the gutter to see the diff between your version and theirs, the branch the offending changes are from, and the issue connected to that branch if there is one.įrom this popup you can also cherry-pick your teammate’s change directly from their local version of the file. Our Early Access Program (EAP) lets our development community participate in the product discussions and influence development planning, from the very early stages. Unfortunately, it's not always possible to resolve a conflict straight away but with the early warning, you'll be better prepared, avoiding any nasty surprises at merge time!Ĭheck out this blog post or the GitLive docs if you want to learn more.įor simple conflicts this can be a quick way to resolve them as identical changes on different branches will merge cleanly.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |