Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Strange merging behavior with brackets or indents #93

Open
ffd8 opened this issue Jan 9, 2022 · 1 comment
Open

Strange merging behavior with brackets or indents #93

ffd8 opened this issue Jan 9, 2022 · 1 comment

Comments

@ffd8
Copy link

ffd8 commented Jan 9, 2022

Just ran into a strange issue where merging makes some mistakes on {} brackets.
Using your demo1, tested the following:

Left editor:

let flipSpeed = 55

function setup() {
	createCanvas(windowWidth, windowHeight)
	background(255)
}

function draw() {
	background(0)
}

Right editor:

function setup() {
	createCanvas(windowWidth, windowHeight)

}

function draw() {

}

What it looks like initially:

image

After the first two merges (shows mistake):

image

Then corrects itself if I add an extra line (only if removing the indented tab):

image

@neeraj-chhatani
Copy link

How to use Ace diff in angular

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants