+[6 years ago]gitinfogeri: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II +[6 years ago]gericanton7 can i just git commit the files which i resolved and do: git push origin TEST-2452 ? +[6 years ago]canton7geri, yes, the idea is that you fix all of the conflicts, then add/commit/push +[6 years ago]canton7but, you must resolve all conflicts +[6 years ago]canton7is off to bed, good luck! It's worth familiarising yourself with the links above
BlueProtoman: can the api be interacted with via a shellscript
+[6 years ago]fullbitSo 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. +[6 years ago]pyfgcrhello, is there an option to login simlpy with my password, without the verification code I get by email? +[6 years ago]scientesffffff +[6 years ago]scientesmaybe i should stop using reset --hard +[6 years ago]scienteslost like half a day's work