halfbrained / cuda_git_conflict Goto Github PK
View Code? Open in Web Editor NEWCudaText plugin. Adds a convenient command to solve git merge conflicts
cuda_git_conflict's People
Contributors
Stargazers
Watchers
cuda_git_conflict's Issues
Choosing appropriate dialog height
@Alexey-T Will this work as universal dlg_menu height here?
DLG_H = 2*app_proc(PROC_GET_GUI_HEIGHT, 'edit') \
+ 3*app_proc(PROC_GET_GUI_HEIGHT, 'label')
patch from Marcus
When called on clean file, must show some statusbar msg like "No Git conflict found"
homepage=(Fill the GitHub repo URL)
add some caption to dlg_menu like 'Git Conflict Solver'
handle n conflicts
file
$ cat merge.txt
<<<<<<< HEAD
this is some content to mess with
content to append
=======
totally different content to merge later
>>>>>>> new_branch_to_merge_later
$ cat merge.txt
<<<<<<< HEAD
this is some content to mess with
content to append
=======
totally different content to merge later
>>>>>>> new_branch_to_merge_later
$ cat merge.txt
<<<<<<< HEAD
this is some content to mess with
content to append
=======
totally different content to merge later
>>>>>>> new_branch_to_merge_later
if I place caret between 1st and 2nd, it takes 1st anyway.
if I place caret between 2nd and 3rd it takes 1st anyway
caret pos after change
doc
$ cat merge.txt
<<<<<<< HEAD
this is some content to mess with
content to append
=======
totally different content to merge later
>>>>>>> new_branch_to_merge_later
$ cat merge.txt
<<<<<<< HEAD
this is some content to mess with
content to append
=======
totally different content to merge later
>>>>>>> new_branch_to_merge_later
$ cat merge.txt
<<<<<<< HEAD
this is some content to mess with
content to append
=======
totally different content to merge later
>>>>>>> new_branch_to_merge_later
scroll to end so 3rd is visible. place caret on >>>>> line.
choose 'imcoming'.
==> caret pos broken
fixed readme
Plugin for CudaText.
Adds a convenient command to solve Git merge conflicts:
'Plugins > Git Conflict Solver > Solve nearest conflict'.
See the intro video for VSCode:
https://www.youtube.com/watch?v=QmKdodJU-js
It finds Git conflict marker in the current document:
<<<<<<< some_name
=======
>>>>>>> some_name
It finds the nearest marker from the current vertical-scroll position,
with "wrapped search" on. And suggests actions for this conflict:
- 'Current change' - Take the upper part
- 'Incoming change' - Take the lower part
- 'Both' - Concatenate and take both parts
Author: halfbrained (https://github.com/halfbrained)
License: MIT
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.