latest 20 messages by MR-D05

+ [2020-06-09T22:31:21Z] MR-D05 or do you raj
+ [2020-06-09T22:28:01Z] MR-D05 jhass do you know why I am getting that error?
+ [2020-06-09T21:43:56Z] MR-D05 anyone have any thoughts?
+ [2020-06-09T21:43:51Z] MR-D05 here's a gist of my action https://gist.github.com/MR-D05/650a197a455da70761b8a5c4b9932ce5
+ [2020-06-09T21:43:07Z] MR-D05 still getting https://imgur.com/a/uaP1ZSd
+ [2020-06-09T21:42:19Z] MR-D05 then created a new release from develop
+ [2020-06-09T21:42:07Z] MR-D05 i even just outright deleted all branches except develop
+ [2020-06-09T21:29:34Z] MR-D05 i just executed the exact commands locally to success
+ [2020-06-09T21:29:21Z] MR-D05 i have an action setup to merge pushes to release branches to develop
+ [2020-06-09T21:28:07Z] MR-D05 why am i getting this error trying to merge a release branch into the develop branch it was branched from? fatal: refusing to merge unrelated histories
+ [2020-06-09T17:54:18Z] MR-D05 is it possible to open a shell to the container that runs the github actions?
+ [2020-06-07T17:14:00Z] MR-D05 gotcha, thanks nedbat
+ [2020-06-07T17:11:06Z] MR-D05 ^
+ [2020-06-07T17:11:04Z] MR-D05 nedbat
+ [2020-06-07T17:10:34Z] MR-D05 so if there are any changes, we need someway to ensure they get reflected back there
+ [2020-06-07T17:10:18Z] MR-D05 so i guess the point of the auto-merging is that anything to the right of develop never explicitly has any relationship to develop again
+ [2020-06-07T17:01:50Z] MR-D05 I guess the idea is that if you are making a feature for the next release and then another for a future release, they would be addressing different parts of the application and so then wouldn't by design be touching the same files/lines of code
+ [2020-06-07T16:59:17Z] MR-D05 because in the case of the two types of feature branches, there may be conflicts as one might alter some code the other is still working on, sothat will produce a conflict going back into develop
+ [2020-06-07T16:58:25Z] MR-D05 ok, I guess I don't understand the idea of continuously merging back into a branch anymore
+ [2020-06-07T16:58:05Z] MR-D05 and they both get merged into develop