wbotelhos

require 'sidekiq/api'

# 1. Clear retry set

Sidekiq::RetrySet.new.clear

# 2. Clear scheduled jobs 

Sidekiq::ScheduledSet.new.clear

b1naryth1ef

from peewee import *

class BModel(Model):
    class Meta:
        database = db

    @classmethod
    def create_table(cls, *args, **kwargs):
        for field in cls._meta.get_fields():
            if hasattr(field, "pre_field_create"):

mattratleph

vimdiff cheat sheet

##git mergetool

In the middle file (future merged file), you can navigate between conflicts with ]c and [c.

Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).

:diffupdate (to remove leftover spacing issues)

:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)