Closed rahulduhan closed 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.
How to resolve conflicts?
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?
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:
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
Maybe that is because is terminal based application and it is bound to some kind of terminal emulator.
Anyway, I have manually resolved all the conflicts. So is it now ready for merge?
Good. Yeah I think so, only in K-9 img's alt there is a space but screw it.
Lawnchair
Syncthing-Fork
Pano Scrobbler
Simple Scrobbler
Showly