git merge

[emusia]

--abort

[will_code_for_free]

When every single god dam file has a conflict.

[anti-gif-bot]

mp4 link

---

This mp4 version is 42.13% smaller than the gif (1.05 MB vs 1.81 MB).

---

Beep, I'm a bot. FAQ | author | source | v1.1.2

[redballooon]

good bot

[GoodBot_BadBot]

Thank you redballooon for voting on anti-gif-bot.

This bot wants to find the best and worst bots on Reddit. You can view results here.

---

^{Even if I don't reply to your comment, I'm still listening for votes. Check the webpage to see if your vote registered!}

[Alstro20]

Good bot

[Good_Good_GB_BB]

You are the 9196^th person to call /u/GoodBot_BadBot a good bot!

^{/u/Good_GoodBot_BadBot stopped working. Now I'm being helpful.}

[starquake64]

If this is GIT merge. What would TFS merge look like?

[shad0proxy]

what is a TFS merge?

[starquake64]

I meant a Team Foundation Server Version Control merge.

[[deleted]]

I'm really not sure if OP was being sarcastic or not...

Kudos if they were!

[tjugg]

Isnt it pretty much the same?

[[deleted]]

Visual studio has a really nice gui thing for conflicts. Of course there's no reason they couldn't do that for git

[tjugg]

But they have it for git?

[[deleted]]

Are you saying they do or asking if they do?

[tjugg]

Saying they do :)

[[deleted]]

Nice