nitaym / ourstheirs Goto Github PK

This website is great. I'd like to print it as a poster and hang it in our office. Are you cool with that?

In the Git Rebase example the user is on the feature branch and wants to rebase master on top.

Given that - the example of

$ git checkout --ours codefile.js

With the label

to select the changes done in master

Is incorrect. In this context --ours refers to the version of codefile.js thats ON our current branch which is actually feature.

So that label should really say

to select changes done in feature

Maybe I'm crazy too.

It would be interesting to set https://nitaym.github.io/ourstheirs/ as the project description or a README.md

This confusing git naming is so well explained at website, I really appreciate it. But, could you please also add another paragraph about same meanings in case of stash's pop conflicts? I guess, it would save millions nerve cells of future generations. :)

First, great page. Clear, to the point, and visually appealing.

When using git mergetool, the signification of LOCAL and REMOTE is also reversed when doing git rebase vs git merge. I think it could be valuable to also mention that on your page, with some examples. Would you be willing to accept a PR ?

Also, maybe mention that the behavior is the same when issuing git pull vs git pull --rebase (might not be obvious for newbies.)

Nice reference, thanks!
I don't use a full-screen browser window, and noticed some of the text doesn't wrap well.
This would also be an issue on mobile (although it seems unlikely this page would be used on a mobile).