If there's a conflict, Retcon shows that to you, but you can keep freely moving commits around—it's not blocking.
Once you're happy with how your history looks like, you can start actually resolving any remaining conflicts, and after that the history gets actually written.
Sometimes, just moving things around further is enough to resolve the conflicts, too, if they're simple enough!
I am an italian guy coming from deep south. After many years working far away from home, friends and beloved ones I now settled in south again working remotely
I prefer to have much less money but be close to people I love
I am in the process of launching the 1st job board for the Embedded System market. This huge market is niche enough to deserve a dedicated job board but there is no a "place to go" online for this job opportunities, so I decided to do it by myself =D