How do I get past this Merge error?

Question

After committing, I tried to Finish the Feature and get the above 2 errors every time.    Where do I configure the device?

I've looked through your forum and can't seem to find anything similar.    This is SourceTree v2.7.6 (177) on a Mac 10.11 machine.

Thanks!

Manju · Answer

Yes, we will have you tagged here in this same post when this gets resolved.

Darin Gurney · Answer

Thank you for the reply and for putting this into your queue.

I'll try to see if I can reconfigure my system to use a Password instead of a Token maybe.

Do you have a process for notifying me when this is resolved?

Manju · Answer

We are aware of an issue which affects only gitflow because gitflow looks for password and we are using token here which aren't getting parsed as expected. We are working on a fix for this for an upcoming release and appreciate your patience.

Thanks!