git：如何用'dev'分支中的文件更新'master'分支？

Question

I am quite new to 'git', although I have a moderate amount of experience with 'svn' already, but I have never had the need to make use of branches with either system until now.

I am working on my first (small) collaborative project, and so have made a dev branch and have been working on my dev/test changes on the dev branch (and have uploaded them to the dev branch in the repo). My current version of the code is now ready to become the new master version (before then working on the next dev revision).

I see that another collaborator has since added a new file (which does not affect the file that I am working on) to the master branch (which I was not previously aware of, as I am in the dev branch locally).

I now need to update the version of " myfile " in the master branch with the version of " myfile " from the dev branch, while not affecting the " theirfile " that the other developer added (and, I suppose, also ideally downloading " theirfile " to my local copy of the master branch as well).

I knew that I would need to deal with this issue in due course, but the presence of this additional file in the master branch on the repo perhaps makes things a little more complicated.

As I am still not too familiar with 'git', and, especially, as I don't want to inadvertently mess up our code repo, could someone please advise what I need to do to update the repo accordingly?

Answer 1

You want to be merging into your master branch with that file. Depending on the git client that you are using you might want to submit a merge request so that the rest of your team can verify this change.

If this is the only file that you have edited, or you are confident that all files in your 'dev' branch are the same as - or updated - versions of their corresponding files in master then use the following command.

git checkout master
git merge dev
git add '{your updated files}'
git commit
git push