You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
During a merge conflict, when the file is too big, going through each hunk and selecting all the changes from ours/theirs is tedious. So, is there an option in lazygit to choose --ours or --theirs?
If not, is there any other way to do this without using custom command?
reacted with thumbs up emoji reacted with thumbs down emoji reacted with laugh emoji reacted with hooray emoji reacted with confused emoji reacted with heart emoji reacted with rocket emoji reacted with eyes emoji
-
During a merge conflict, when the file is too big, going through each hunk and selecting all the changes from ours/theirs is tedious. So, is there an option in lazygit to choose
--oursor--theirs?If not, is there any other way to do this without using
custom command?Beta Was this translation helpful? Give feedback.
All reactions