Closed jrddunbr closed 1 year ago
lol
reason for merge conflict is because I added a commit and then he added more changes on his branch. This rebase should be easy if I drop the top commit, FF, and then re-add the commit.
lol