git

Hi everyone! What we’re trying to tackle today is a very common problem, that I’m sure all of you encountered. Suppose you’re on your git feature branch, you want to merge it into another branch (being it master, staging, production, whatever) and you’re asking yourself: will there be conflicts?. If you’re using Github, you can simply open the Pull Request page for your feature branch and look for the following box:...