latest 13 messages by gitnoob

+ [2016-11-20T22:12:33Z] gitnoob is this a good way to resolve the conflicts, and can someone give me some help?
+ [2016-11-20T22:12:17Z] gitnoob and then apply branch x from its current HEAD ontop of master
+ [2016-11-20T22:11:45Z] gitnoob I basically want to rollback master to the point before I merged my changes from branch x
+ [2016-11-20T22:11:22Z] gitnoob and I've continued working on branch x
+ [2016-11-20T22:11:15Z] gitnoob Now someone else has pushed ontop of that
+ [2016-11-20T22:11:06Z] gitnoob to a remote branch
+ [2016-11-20T22:10:50Z] gitnoob but i didn't resolve the merge conflicts properly before I pushed
+ [2016-11-20T22:10:40Z] gitnoob and i merged into master
+ [2016-11-20T22:10:35Z] gitnoob I had a new branch
+ [2016-11-20T22:10:28Z] gitnoob i'm a bit stuck
+ [2016-11-20T22:10:26Z] gitnoob hello