After making sure your branch is up to date with the remote(origin) master branch, you can also try this:
git reset --soft origin/master
This will let you add all the changes into a single commit.
This looks like a nice short-cut if you need all changes in a single commit. ty Shankar
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
After making sure your branch is up to date with the remote(origin) master branch, you can also try this:
git reset --soft origin/master
This will let you add all the changes into a single commit.
This looks like a nice short-cut if you need all changes in a single commit. ty Shankar