Some recent changes lost during merging (because not rebased)

dpeters / puppet-opsview

Puppet types/providers to support Opsview resources

12 stars 10 forks source link

Some recent changes lost during merging (because not rebased) #28

Open antaflos opened 10 years ago

antaflos commented 10 years ago

It seems during the merging of my last few PRs some changes got lost or overwritten by a subsequent merge. I suppose this is what happens when multiple PRs are based on the same branch and are not rebased onto each other after merging.

See for example here: https://github.com/dpeters/puppet-opsview/commit/30bf5ecf96808bee929f5ba6564c10b2307a1875#diff-607433e86b1e0ffc273b035552d1d845L22 (the refined insync? method of the 'servicechecks' property has been overwritten).

What to do?

dpeters commented 10 years ago

Ah - yeah, this was my fault. When resolving the merge conflicts, I just chose to have code from the latest PR win.

Just pushed a branch with 1640615, which should restore the sorting. Let me know If that looks good, and I'll merge it.