Hi all,
It's getting harder and harder, isn't it?
Not at all 
Let's say we have an 'exp' branch where we're implementing a new feature for our project and, of course, committing there. Also, during our development, some interesting work has been done to branch origin (the remote master branch) of our project and we wanna get this interesting work back to our feature. So we would:
$ git-checkout master$ git-pull$ git-checkout exp$ git-rebase master
This will update our exp branch but keep our patch-series as top-most patches. If, during this process, we have a conflict we should solve it by editing the conflicted and run:
$ git-add /path/to/conflicted/file.c$ git-rebase --continue
NOTE: Do not use git-commit during this process.
After this, run:
$ git-log
To see your patch-series updated and still as top-most patches 
That's easy
See y'all