# Tweet by [@keefmoon](http://twitter.com/keefmoon) on 2018-02-26 12:23:10 > [!INFO] Archived from [original tweet](http://twitter.com/keefmoon/status/968099115304390657) In reply to: [@palmin](http://twitter.com/palmin/status/968066727379718144) @palmin Rebasing issue number 2. Using conflict resolution tools, “Resolve using theirs” and “resolve using mine” are flipped when compared to doing a merge.