-
Git repo now configured properly for UE4Editor to detect a conflict and prompt for a resolution. However, we block launches from happening when a merge conflict is encountered. Thus, we should investi…
-
I must be able to script registering a merge driver. Can this configuration artifact
```
[merge "my-custom-driver"]
name = A custom merge driver used to resolve conflicts in certain files
driver…
-
When we try to land PRs we apply metadata generated in the downstream sync by cherry-picking it from the sync branch. This can result in merge conflicts that require manual fixup. However we could do …
-
Originally reported on Google Code with ID 1173
```
Required information!
OS version: Win2k/WinXP/Vista/Win7/Win8 SP? x86/x64
ConEmu version: 130726 x64
*Bug description*
I was using git mergeto…
-
Hi, I wanted to change P4Merge (which just isn't for me) to another tool (VsCode for example).
But the current state in master appears to be broken. `AcknowledgeableMessage` is missing some stuff fr…
bj-rn updated
2 years ago
-
**Is your feature request related to a problem? Please describe.**
Is very hard to resolve merge conflicts by hand in text editor it very error prone
**Describe the solution you'd like**
There s…
-
## Feature description
Git Extensions has a handy feature for verifying your GIT setup is configured properly, the only problem is that it doesn't take into account any system wide settings…
-
fatal: unable to access 'https://github.com/xxx': OpenSSL SSL_connect: SSL_ERROR_SYSCALL in connection to github.com:443
Resolving:
```sh
git config --global --unset-all remote.origin.proxy
```
-
**Do you want to request a *feature* or report a *bug*?**
Report a bug.
**What is the current behavior?**
In the global .gitconfig I have defined several custom merge and diff tools. To distingui…
-
**Version info**
Mac OS Ventura 13.4.1
Stable, 2901
**Description**
When I click - Open in Editor, nothing opens.
I tried to change the default editor in settings but that doesn't change …