Comments (3)
kmoth
commented on August 12, 2024
9
To add to these other lovely suggestions: I would enjoy a quick way to resolve conflicts by taking either Theirs or Mine for the entire file.
Even better would be using the branch names rather than Theirs/Mine labels, like: "Resolve using my-cool-feature" or "Resolve using develop".
(KEEP UP THE GOOD WORK THIS THING IS AWESOME)
from sublime_merge.
rchl
commented on August 12, 2024
5
I would very much appreciate way to automatically jump to conflict resolving of next unresolved file, after I'm done with previous file and staging resolved changes.
from sublime_merge.
srbs
commented on August 12, 2024
Save and Stage is the default save action in the merge tool as of dev build 1114.
from sublime_merge.
Related Issues (20)
- Sublime Merge to work with local private repositories HOT 1
- Dialog for checking updates and about info only show parts of the content, right side is cropped
- Sublime Merge prevent Windows 11 task bar from auto showing HOT 3
- Highlight of Change Area Seems Wrong HOT 1
- File path selectable/copyable in merge editor. HOT 1
- Ability to bookmark branches
- Amend fails when commit message is nothing but newlines HOT 1
- Add option to always show tab bar - even with only one single tab HOT 2
- custom `create_branch` command doesn't read `$branch` prefix HOT 2
- Unstaging hunk from a renamed file errors out HOT 1
- Crashes GNOME/hangs entire system if external monitor configuration changes HOT 1
- Overridden username and email are not used when editing a commit message HOT 2
- Selected file and scroll position lost when new commits fetched HOT 1
- Slow scrolling in Files tab when tooltips are showing HOT 5
- Long repo names cause tab order to change HOT 1
- `smerge .` Means Open the Current Repository!
- Improve colorized text readability in the command output viewer HOT 2
- Git failed exit code 128
- Stuck the Xfce4 desktop environment
- Viewing a Stash with Untracked Files HOT 4
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from sublime_merge.