+ [2019-07-28T20:51:59Z] geri canton7 can i just git commit the files which i resolved and do: git push origin TEST-2452 ?
+ [2019-07-28T20:52:19Z] canton7 geri, yes, the idea is that you fix all of the conflicts, then add/commit/push
+ [2019-07-28T20:52:25Z] canton7 but, you must resolve all conflicts
+ [2019-07-28T20:52:54Z] canton7 is off to bed, good luck! It's worth familiarising yourself with the links above
+ [2019-07-29T23:43:29Z] fullbit So my organization has basic gitflow setup BUT also have `develop` and `master` as protected branches AND also squashes commits. Everything was fine until I had to make a hotfix and ever since there is this persistent merge conflict when trying to make a new release branch merge to master. Is there any way to fix this situation? I've tried force pushing a newly forked master.

message no. 174340

Posted by fullbit in #github at 2019-07-29T23:43:29Z

So my organization has basic gitflow setup BUT also have `develop` and `master` as protected branches AND also squashes commits. Everything was fine until I had to make a hotfix and ever since there is this persistent merge conflict when trying to make a new release branch merge to master. Is there any way to fix this situation? I've tried force pushing a newly forked master.
+ [2019-07-30T14:38:26Z] pyfgcr hello, is there an option to login simlpy with my password, without the verification code I get by email?
+ [2019-07-30T20:02:19Z] scientes maybe i should stop using reset --hard
+ [2019-07-30T20:02:28Z] scientes lost like half a day's work
+ [2019-07-30T20:02:51Z] scientes or at least commit at the end of the day