ibizaman/emacs-conflict ibizaman/emacs-conflict

  • Stars
    star
    25
  • Rank 957,573 (Top 19 %)
  • Language
    Emacs Lisp
  • License
    GNU General Publi...
  • Created about 5 years ago
  • Updated about 2 years ago
Twitter logo Share LinkedIn logo Share Facebook logo Share
ibizaman/emacs-conflict
github

ibizaman

Reviews

There are no reviews yet. Be the first to send feedback to the community and the maintainers!

Repository Details

Resolve conflicts happening when using file synchronization tools

More Repositories

1

selfhostblocks

Building blocks for self-hosting with battery included.
Nix
92
star
2

pcachefs

FUSE filesystem that presents a mirror of other filesystems, with transparent caching.
Python
41
star
3

pass-clip

A pass extension that lets you quickly copy to clipboard passwords using fzf or rofi
Shell
33
star
4

hs-template-nix

haskell project using nix
Nix
17
star
5

pass-ssh

A pass extension that lets you quickly create ssh keypairs and output public keys using fzf or rofi.
Shell
15
star
6

docker-ibcontroller

Docker image to install ib-controller AUR package
Shell
12
star
7

hs-template-project

Template haskell project to bootstrap a haskell project
Haskell
11
star
8

elmboard

Dashboard in ELM
Elm
3
star
9

jsondispatch

Server program that accepts HTTP requests with a JSON payload and forwards the request to another program after transformation.
JavaScript
3
star
10

upnpport

Maintains port forwarding in UPnP compatible routers
Python
3
star
11

bogey

Best Open Game Ever, Yeah !
C++
2
star
12

haskell-keycloak

Command-line interface and library to configure Keycloak domain records
Haskell
2
star
13

deluge-plugindev

Create a deluge plugin skeleton without setting up a python environment
Nix
2
star
14

dbobject

Template-based Object Relational Mapper for C++
C++
1
star
15

godaddyip

Maintains A and CNAME records matching current ip in Godaddy.
Python
1
star
16

docker-archlinux

Archlinux dockerfile based on the official `base/archlinux` image but up to date concerning PGP keys and packages.
Shell
1
star
17

conffiles

My conffiles for vim and git
Vim Script
1
star
18

rpi

RPI Installers
Shell
1
star
19

emacs-conf

My emacs config
Emacs Lisp
1
star
20

blog

My blog about programming, electronics and some other DIY projects.
CSS
1
star