Git merges some files under idea


There are two branches under git, foo branch and bar branch. If you want to merge some files on bar branch into foo branch, there is a convenient operation method under idea.

First switch to the foo branch, click the GIT: foo tab button in the lower right corner, select the bar branch of local branches in the menu, select Show diff with work tree, select the file you want to pull in the pop-up window, and right-click to select get from branch~

This work adoptsCC agreement, reprint must indicate the author and the link to this article