search

gruppe-adler / gruppe_adler_mod

Gruppe Adler Mod is a collection of Gruppe Adler original addons that add new functionality or modify and improve existing functionality to suit our Arma gameplay.
GNU General Public License v2.0
12 stars 6 forks source link

Revert "meh" #207

Closed DerZade closed 2 years ago

DerZade commented 2 years ago

Reverts gruppe-adler/gruppe_adler_mod#206

@AdlerSalbei Your PR (#206) included commits from 2018. I just wanted to make sure that everything was right. If this is not the case, please merge this PR and try again :D

AdlerSalbei commented 2 years ago

I'm confused, why would you revert me bringing a branch up to date. So that I can work on it with out having issues in the future?

DerZade commented 2 years ago

I'm confused, why would you revert me bringing a branch up to date. So that I can work on it with out having issues in the future?

I'm not reverting. I'm suggesting to revert your changes. That how you use a PR 😛. It's not just merging changes, it's requesting to merge changes.

I just found it confusing that your PR contained various commits from different times (some from 2018 and some from 2022), sometimes with no correlation between commits at all. That didn't seem right to me at all. Would you care to elaborate? You didn't give anyone a chance to challenge your changes in your PR, because you merged it instantly. So I opened this PR and challenge them here 😇

DerZade commented 2 years ago

Okay apparently I'm completely stupid. You merged master into your own branch. I assumed the other way around 🤦‍♂️ Maybe opening GitHub at 2AM is not the best idea.

But why the fuck would you open a PR for merging master into your WIP branch?

git checkout applyACEMedicalDamageViaZeus
git merge master

or even

git checkout applyACEMedicalDamageViaZeus
git rebase master

gif

AdlerSalbei commented 2 years ago

I don't see the issue. With out having to open an Terminal. You can easily move the master over :P