Psyhackological / AAA

:iphone: Curated list of THE BEST FOSS Android apps to maximize your freedom & privacy!
https://codeberg.org/Psyhackological/AAA
Creative Commons Attribution 4.0 International
1.78k stars 32 forks source link

Added more apps! #20

Closed rahulduhan closed 2 years ago

rahulduhan commented 2 years ago

Lawnchair

Syncthing-Fork

Pano Scrobbler

Simple Scrobbler

Showly

rahulduhan commented 2 years ago

Fair Mail

K-9 Mail

Magisk

rahulduhan commented 2 years ago

I think that is all. You're not going to slow down, aren't you?

I m just starting to learn github and I have some free time from linux stuff as my head is hurting because 2 days ago I messed my dotfiles and don't want to touch them for a week.

rahulduhan commented 2 years ago

How to resolve conflicts?

Psyhackological commented 2 years ago

I m just starting to learn github and I have some free time from linux stuff as my head is hurting because 2 days ago I messed my dotfiles and don't want to touch them for a week.

I have started learning GitHub too. Oh, dotfiles of what?

Psyhackological commented 2 years ago

Well as far as I know when you set editor in configuration git will detect when there are conflicts and if they are then he is going to open conflict in your editor and you have 3 options:

  1. Resolve by choosing original
  2. Resolve by choosing yours
  3. Both
rahulduhan commented 2 years ago

Well as far as I know when you set editor in configuration git will detect when there are conflicts and if they are then he is going to open conflict in your editor and you have 3 options:

1. Resolve by choosing original

2. Resolve by choosing yours

3. Both

no option in vim

Psyhackological commented 2 years ago

Maybe that is because is terminal based application and it is bound to some kind of terminal emulator.

rahulduhan commented 2 years ago

Anyway, I have manually resolved all the conflicts. So is it now ready for merge?

Psyhackological commented 2 years ago

Good. Yeah I think so, only in K-9 img's alt there is a space but screw it.