I created a branch from a repository in GitHub . I worked on this branch creating your own commits . The branch is in the remote repository.
Meanwhile the master was evolving, developing code in master .
In principle, the master and branch developments are in different files.
I wanted to do a pull request, to join the branch code in the master. What is the best way to keep all files up to date?
Example of commits scheme:
A-B-C-D-E-F-G -> master
\ /
A-B-C -> mobile
In Github, you can make a Pull Request from branch mobile to branch master .
After this, this merge request will be available for evaluation. If all is right, just enter the pull request request and approve the merge from it in the master.
If there are conflicts, you have two options:
master to branch mobile , resolve conflicts and make push of resolution to branch mobile . The Pull Request will automatically detect that the conflict has been resolved and allow merge. mobile to branch master . The resolution of the conflict will occur in the%% branch itself.