First rebase with you master branch ie.
Just find in top menu VCS - > Git -> Rebase in the popup window left everything like it is, but in field "From:" write "HEAD~X" where "X" is "N - 1" commits back. Reason is that you have to squash it into one, usualy the last one . So if u have 7 commits, put there HEAD~6 . You will have to change name of commit.
git pull --rebase origin masterThen your commits on the top of branch and u can squash N commits into one.
Just find in top menu VCS - > Git -> Rebase in the popup window left everything like it is, but in field "From:" write "HEAD~X" where "X" is "N - 1" commits back. Reason is that you have to squash it into one, usualy the last one . So if u have 7 commits, put there HEAD~6 . You will have to change name of commit.
