Git merge issues

When merging a branch that's separated from the master after a lot of changes, it may get weird problems.

One of the efficient way to merge:

1, Create a new branch from the newest master 2, Cherry pick all the changes you did in your feature branch. 3, Merge the new branch into staging or master.

These operations can be done in phpstorm GUI, so no need to remember the commands. But to note, phpstorm has a bug (or you can call it an non-intuitive or non-user-friendly design):

When deleting a local branch, then checkout the remote branch, it doesn't re-download the newest code from the remote, you have to click "Update Selected" to update that new branch.