search

aalmiray / java-champions

A list of Java Champions
https://javachampions.org
349 stars 199 forks source link

Updated main #177

Closed mkheck closed 10 months ago

aalmiray commented 10 months ago

Uh ... what's going on with this PR? Yaml files renamed & merge conflicts?

mkheck commented 10 months ago

I'm looking, but I don't see any merge conflicts listed. 🤔

Initially, I had logged a PR (which you approved) against master - it's been awhile since I've logged any changes here 😄 - but oddly enough, only the Bluesky one was kept. The others somehow didn't make the cut.

So I started the sync with main, updated, issued a PR...and meanwhile I got pulled into a couple other directions with work. Apologies if this muddled things.

Just let me know how you'd like me to proceed to get those updated socials incorporated. Thanks.

aalmiray commented 10 months ago

Well there are 15 commits in this PR, many of which have already been applied. And a few comments such as

<<<<<<< HEAD
#  citizenship: primary citizenship (if different from nomination, residence, birth)
=======
>>>>>>> d2147c0d9d2ebe172f5b8f6a5d11a4593bd9acb3

which I deemed "merge conflicts". I think it would be best to restart this PR by rebasing from latest main. We moved away from master months ago ;-)

mkheck commented 10 months ago

Ok. I'll just start over.