merge-conflicts icon indicating copy to clipboard operation
merge-conflicts copied to clipboard

Published 20 hours ago • verified publisher icon smashwilson

Grant achievements on successful merge

Open rgbkrk opened this issue 11 years ago • 5 comments

Unlock achievements when users finish particular actions.

Some ideas:

  • Finishing their first merge "Maybe now they'll finally accept your PR"
  • Merging X hunks "You are a noble git warrior"
  • Stopping merge conflicts without merging anything "Guess there's a better way"

rgbkrk avatar Mar 15 '14 20:03 rgbkrk

:+1: Hell yes. I'll likely wait on rgbkrk/atom-achievements#5 to implement the merging-X-hunks ones, though.

smashwilson avatar Mar 15 '14 20:03 smashwilson

  • Selfish: Accept only your side for an entire merge.
  • Low Self Confidence: Accept only their side for an entire merge.
  • Voltron: Resolve a conflict as "both".
  • Author: Edit a conflict in-place before you accept it.
  • No, That's Not Right: Revert an edit back to its original form and accept it.
  • Mouse-Averse: Resolve an entire conflict using only the keyboard.
  • Ambidextrous: Resolve an entire conflict using only the mouse.
  • Just So: Use a non-default keybinding for a merge-conflicts action.
  • Orderly: Resolve all hunks in a conflict in a single pass.

smashwilson avatar Mar 15 '14 21:03 smashwilson

I bet @atiaxi could come up with some great ones here. Terrible puns are right up his alley.

smashwilson avatar Mar 15 '14 21:03 smashwilson

Haha, those are so much better than the ones I came up with.

rgbkrk avatar Mar 15 '14 23:03 rgbkrk

:+1: This is most requested feature that I have added a thumbs up to on this repo today.

rgbkrk avatar Mar 03 '16 02:03 rgbkrk