Closed avtobiff closed 9 years ago
No, it is from master so you need to rebase if there are conflicts.
You should do that anyway and not just click the merge button, in order to get a nice git history.
I'm sorry, and I would like to thank advice. I will take care to the next opportunity.
Thank you!
I hope that Pull-Request is changed from the latest source. Otherwise, it may conflict.