Questions tagged [automerge]
35 questions
2
votes
1 answer
Git consistently merging one file incorrectly
I'm having a weird issue with git's merge feature that I've never seen before. I am merging some changes from a branch into master and git seems to be consistently having trouble with one particular file.
It's basically merging content into…
d512
- 32,267
- 28
- 81
- 107
1
vote
1 answer
Karma-Jasmine do not identify all Angular unit tests when using Automerge package
Problem:
Having a weird issue with the Karma runner. It does not identify all the unit tests while running ng test command.
Reproduce:
I have created this stackblitz:…
Parth Kheni
- 71
- 7
1
vote
1 answer
Is there any way I can make automerge work without upgrading to webpack 5?
I'm trying to use Automerge ( https://automerge.org/) in a Reactjs project. As described in Automerge's document, with webpack 5, to setup automerge, we need to enable "experiments.asyncWebAssemby".
Unfortunately, the project I'm working on is using…
meaholik
- 440
- 5
- 19
1
vote
2 answers
Auto merge using git commands in Azure .yml pipeline
I have a requirement to automate the merge through azure pipeline upon deployment is complete.
For example : I have a branch - 'release/1.0.0' which is used for the deployment, post deployment this branch needs to be auto merged into main branch…
krishna
- 11
- 3
1
vote
1 answer
Apply major/minor/patch automerge logic to SHA pinned dependencies with Renovate
I am using Renovate on a GitHub repository to keep dependencies up to date.
I want to automerge patches and minor releases, but I want to let minor releases ripen for a few days, using the stabilityDays setting. This seemed to be working with this…
Tom Willis
- 306
- 4
- 10
1
vote
1 answer
Conflict during git revert on a single file
I'm using git revert on a very basic use case, in order to learn how it really works, but I'm facing the following issue. I've read a couple of posts on similar scenarios, but none has provided a clear answer to this in my opinion. I've surf the…
ankaAJ
- 47
- 8
1
vote
2 answers
Bitbucket Server - ignore certain files during auto-merge
I want to ignore my project version file from auto-merge in Bitbucket Server as this file is always going to be different for different branches. For this, I have created a merge driver similar to the below in repository's .gitconfig
[merge "ours"] …
thoudam
- 11
- 2
0
votes
0 answers
How do I use the applyChanges(currentDoc, changes) function with the change from getLastLocalChange(newDoc) from Automerge?
public onMessage(change: MessageEvent) {
let [newDoc] = Automerge.applyChanges(globalBoardState, change.data)
applyLatestChange(newDoc)
this.view.render();
}
public send() {
let lastChange =…
0
votes
0 answers
Error using Automerge (frontend library with .wasm imports) with esbuild: `Uncaught TypeError: (void 0) is not a function`
Problem
When I try to run the following code I get an error that I haven't been able to fix.
// assets/js/app.js
41 ...
42 import * as automerge from "@automerge/automerge"
43 const doc = automerge.init()
44 ...
The error in the browser (Chrome)…
Coen Bakker
- 85
- 8
0
votes
0 answers
Implement Github Auto merge via API
As per https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request , auto-merge option is available in GitHub . But, it is a manual process. Is there any…
Karan
- 41
- 2
0
votes
0 answers
Bitbucket: Automerge develop branch into other branch after commit
In Bitbucket, is there a way to automatically merge the develop branch into a specific branch, after a commit on develop has happened?
UseCase: we have a package-updates branch which is used for renovate to update and test newer versions of the used…
NiHiLiST
- 1
0
votes
1 answer
Why auto merge don't work in bitbacket on this case?
I made such config for branch model
After i made release branch and merge it to develop via pull request:
i was expected auto merge for develop to master but nothig happend.
Artemy Prototyping
- 170
- 1
- 9
0
votes
3 answers
Find all commits in a particular branch in GIT
This might be a repeated question but i didn't find exact answers.
Lets say i have 2 branches br1 and br2 with 3 commits each.
br1
commit a
commit b
commit c
br2
commit d
commit e
commit f
When i merge from br2 to br1, git log on br1 show…
Senthil A Kumar
- 10,306
- 15
- 44
- 55
0
votes
1 answer
Merge conflicts stick together after merging
When git-merging two branches which produces two merge conflicts located in non-coherent lines I wonder why the output produced by auto-merge only shows one conflict containing multiple equivalent lines.
The following shows the output after…
Lukas
- 314
- 3
- 14
0
votes
1 answer
SVN: why is it always necessary to merge before checking in if your file is out of date?
Consider the following scenario:
Hally and Sarry both check out the same revision of file A.
Both make some changes to A.
Hally checks in first, no drama.
Sarry then tries to check in; gets told her file A is out of date and she needs to merge the…
igbgotiz
- 892
- 1
- 8
- 28