One of the most salient features of our Tech Hiring culture is that there is so much bullshit. Everyone knows this. Each of us contributes his share. But we tend to take the situation for granted.
since you have pulled origin/master, that commit represents the latest and greatest that the project has.
since you have merged origin/master so that you are not behind the project's latest and greatest. The commit that you did after merging contains the right working tree that you want to submit.
after git reset --soft origin/master, when you commit again, you have the exact same right working working tree BUT its direct parent will be origin/master. (1)
from the perspective of the maintainer, the git history is clean : exactly one new commit above his master branch.
(1) As the friendly manual says,
git reset --soft <commit> # here <commit> = origin/master
Does not touch the index file or the working tree at all
(but resets the head to <commit>, just like all modes do).
This leaves all your changed files "Changes to be committed",
as git status would put it.
Hope that helps :)
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.
Sure!
originis the original project and not your fork.origin/master, that commit represents the latest and greatest that the project has.origin/masterso that you are not behind the project's latest and greatest. The commit that you did after merging contains the right working tree that you want to submit.git reset --soft origin/master, when you commit again, you have the exact same right working working tree BUT its direct parent will beorigin/master. (1)(1) As the friendly manual says,
Hope that helps :)