Create a test for `rebaseBranch` (with a basic conflict)

git-up / GitUp

The Git interface you've been missing all your life has finally arrived.

http://gitup.co

GNU General Public License v3.0

11.44k stars 1.23k forks source link

Create a test for `rebaseBranch` (with a basic conflict) #989

Closed lapfelix closed 1 week ago

lapfelix commented 2 months ago

... and move resolveConflictsWithResolver method into a GCLiveRepository category to make that possible (otherwise GIViewController and all of its dependencies would need to be included in the tests and I don't think that's necessary).

I'm having daily issues with complex rebases that have multiple conflicts and then leave the working directory dirty once the rebase is done. This doesn't solve them, but it's a first step towards that.

I AGREE TO THE GITUP CONTRIBUTOR LICENSE AGREEMENT

lucasderraugh commented 2 months ago

Thanks @lapfelix. The rebasing issues are rather annoying so I appreciate your effort in trying to help out there. I'll be sure to review your PRs this week.