 |
Post Afk7adNfHglXvssjSq by [email protected] |
 |
More posts by [email protected] |
|
Post #Afk7adJ3Yp4zhaj3HU by [email protected] |
|
0 likes, 1 repeats |
|
|
|
let's imagine you're resolving this merge conflict (in screenshot).You&… |
|
|
|
Post #Afk7adNfHglXvssjSq by [email protected] |
|
0 likes, 0 repeats |
|
|
|
@b0rkSigh heavily and figure out manually what should actually be there |
|
|
|
Post #AfkDrrUSg50yLBeuQ4 by [email protected] |
|
0 likes, 0 repeats |
|
|
|
@Balise how do you figure it out manually? |
|
|
|
Post #AfkDrrYiQGPwYNeJ3A by [email protected] |
|
0 likes, 0 repeats |
|
|
|
@b0rkIn that specific case, figure out whether I actually want one or two newli… |
|
|
|
Post #AfkdVTPs6Las77UsGe by [email protected] |
|
0 likes, 0 repeats |
|
|
|
@b0rk Assuming I have the time, I do `man git-diff` in this kind of situation.E… |
|
|
|
Post #AfkoaFRuYbW3jtvk24 by [email protected] |
|
0 likes, 1 repeats |
|
|
|
a bunch of people have said that they feel embarrassed that they're still c… |
|
|
|
Post #Afml8VI29oA9DJJDEm by [email protected] |
|
0 likes, 0 repeats |
|
|
|
@crmsnbleyd interesting! how do the arrows help you figure out which code is wh… |
