GIT – merge selective files

To selectively merge files from one branch into another branch, run where: branchX is the branch you want to merge from into the current branch The –no-commit option will stage the files that have been merged by Git without actually committing them. This will give you the opportunity to modify the merged files however you want to and then commit […]