We recently switched from SVN to GIT, and I\'m having some trouble converting our previous workflow. Mostly everything works, but today I got a weird cherry-pick conflict.
