![تويتر \ Algolia على تويتر: "Different uses of #Git`rebase`- first, as a way to integrate and exchange your work between two branches (like `merge` does), but also as a history rewriting tool. تويتر \ Algolia على تويتر: "Different uses of #Git`rebase`- first, as a way to integrate and exchange your work between two branches (like `merge` does), but also as a history rewriting tool.](https://pbs.twimg.com/media/DQZemHpVoAAof6G.jpg:large)
تويتر \ Algolia على تويتر: "Different uses of #Git`rebase`- first, as a way to integrate and exchange your work between two branches (like `merge` does), but also as a history rewriting tool.
![Merge conflicts: "use ours" "use theris" buttons are not available for binary files. · Issue #624 · gitahead/gitahead · GitHub Merge conflicts: "use ours" "use theris" buttons are not available for binary files. · Issue #624 · gitahead/gitahead · GitHub](https://user-images.githubusercontent.com/87855864/133428390-7edbb35e-dfd6-4364-bba6-b5d292e2fa88.png)
Merge conflicts: "use ours" "use theris" buttons are not available for binary files. · Issue #624 · gitahead/gitahead · GitHub
![github - (Git Merging) When to use 'ours' strategy, 'ours' option and ' theirs' option? - Stack Overflow github - (Git Merging) When to use 'ours' strategy, 'ours' option and ' theirs' option? - Stack Overflow](https://i.stack.imgur.com/9r32K.gif)