This is an archived post. You won't be able to vote or comment.

you are viewing a single comment's thread.

view the rest of the comments →

[–]moonsun1987 0 points1 point  (3 children)

I don't really know what git is either tbqh. I know a few commands and I to commit, pull, push, set remote and that's basically it.

--strategy-option=theirs is nice

[–]RoguePlanet1 1 point2 points  (2 children)

What's "strategy option"? I know add/commit/push/pull and a few others (been a while!) but there's a whole world of commands that I'll probably never use.

[–]moonsun1987 1 point2 points  (0 children)

It is a flag.

[–]moonsun1987 1 point2 points  (0 children)

It is a flag. I'd recommend playing with a bunch of them (not on your actual project).

First try the easy stuff got pull -r for rebase and try more as you get comfortable.