adding buttons: get all theirs/ours

FlaShG / GitMerge-for-Unity

Unity plugin for merging sceneand prefabs files when using git.

GNU General Public License v2.0

197 stars 27 forks source link

adding buttons: get all theirs/ours #49

Closed narlee closed 3 years ago

narlee commented 9 years ago

addind button: get all theirs/ours

without this small issue merging continues very slow.

add buttons on merging: get all theirs get all ours

without saving (clicking 'fix')!

FlaShG commented 9 years ago

To completely override "their" changes with your own, you can simply use "git checkout --ours", and vice versa use "git checkout --theirs" to only use their version and discard "ours".

I'm not sure if additional buttons would improve the tool's workflow. Maybe for GUI users?

narlee commented 9 years ago

thanks, I'm know this. but if user want to select lots of all theirs components and get one ours - it will be very slowly!!!!

problem in objects with many conflicts and selecting bit ours/theirs (not totaly OURS or totaly THEIRS)

FlaShG commented 3 years ago

To be honest, I don't quite remember when exactly, but this was recently added.