We have master branch and my issue branch (my_issue). my_issue starts from master.
So, while Im working on my_issue,other developers merge their issues in to master, e.g. issue_1 and issue_2 (every branch has more then one commit). And after I finish on my branch I merge master (with all new issues) again in my branch and push my changes.
On my_issue there is a file bugfile.py that I modified and a file my_new.py that I created. I merge my_issue into master.
After pull my_issue into master, things go wrong and I need to rollback my_issue from master. So I have delete my_new.py and modify back bugfile.py. I dont need to rocllback issue_1 and issue_2? just my_issue.
I understand that I can manually remove my_new.py and manyually modify bugfile.py and push them as new commit, but it looks not correct.
Is there a way of doing that using git.
