![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
![Have a messy #gitmerge, but know that one branch is ahead of the other and it should override the other? Use the merge -X strategy-option… | Git, Linux, Preferences Have a messy #gitmerge, but know that one branch is ahead of the other and it should override the other? Use the merge -X strategy-option… | Git, Linux, Preferences](https://i.pinimg.com/originals/a5/0b/28/a50b285345570124ebe4ff98d4d6593c.png)
Have a messy #gitmerge, but know that one branch is ahead of the other and it should override the other? Use the merge -X strategy-option… | Git, Linux, Preferences
![تويتر \ 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)