Resubmit Changes to Layout (Into dev)

[ExtremeFiretop]

Changes to Layout (Into dev)

[Martinski4GitHub]

Changes to Layout (Into dev)

What happened?
Did something go wrong when merging the two PRs just now?

[ExtremeFiretop]

Changes to Layout (Into dev)

What happened? Did something go wrong when merging the two PRs just now?

One PR (the change in layout) was a deviation from the Changelog PR.
So basically. I branched off from the Changelog PR and made more changes and submitted another PR for the change in layout. It was to be merged into the Changelog PR. Which was to be merged into dev.

So you would of needed to merge the change in Layout first, and then the Changelog PR, for them to all make it into dev the first shot.

[Martinski4GitHub]

Changes to Layout (Into dev)

What happened? Did something go wrong when merging the two PRs just now?

One PR (the change in layout) was a deviation from the Changelog PR. So basically. I branched off from the Changelog PR and made more changes and submitted another PR for the change in layout. It was to be merged into the Changelog PR. Which was to be merged into dev.

So you would of needed to merge the change in Layout first, and then the Changelog PR, for them to all make it into dev the first shot.

Ah, OK. I had assumed that each PR was branched off the main trunk, so the merge order would not matter.
But it's no problem and is easy to fix with your resubmission. Good eye for catching it!!

[Martinski4GitHub]

Approved.

[ExtremeFiretop]

Changes to Layout (Into dev)

What happened? Did something go wrong when merging the two PRs just now?

One PR (the change in layout) was a deviation from the Changelog PR. So basically. I branched off from the Changelog PR and made more changes and submitted another PR for the change in layout. It was to be merged into the Changelog PR. Which was to be merged into dev.
So you would of needed to merge the change in Layout first, and then the Changelog PR, for them to all make it into dev the first shot.

Ah, OK. I had assumed that each PR was branched off the main trunk, so the merge order would not matter. But it's no problem and is easy to fix with your resubmission. Good eye for catching it!!

Yeah I hear you, I usually do make them off the dev branch directly, but this time I was pretty sure about the Changelog function but wasn't so sure about the change in layout so I branched off from the Changelog PR instead of dev.

I probably threw you off/threw you a curve ball by changing it up hahaha

[Martinski4GitHub]

Changes to Layout (Into dev)

What happened? Did something go wrong when merging the two PRs just now?

One PR (the change in layout) was a deviation from the Changelog PR. So basically. I branched off from the Changelog PR and made more changes and submitted another PR for the change in layout. It was to be merged into the Changelog PR. Which was to be merged into dev.
So you would of needed to merge the change in Layout first, and then the Changelog PR, for them to all make it into dev the first shot.

Ah, OK. I had assumed that each PR was branched off the main trunk, so the merge order would not matter. But it's no problem and is easy to fix with your resubmission. Good eye for catching it!!

Yeah I hear you, I usually do make them off the dev branch directly, but this time I was pretty sure about the Changelog function but wasn't so sure about the change in layout so I branched off from the Changelog PR instead of dev.

I probably threw you off/threw you a curve ball by changing it up hahaha

You sure did!! LOL!!! But it all ended up in the right place now, and we're good to go, so no worries.