(The error was parsed as 38: There are unresolved conflicts in the working directory.) Hint: as appropriate to mark resolution and make a commit.įatal: Exiting because of an unresolved conflict.
Hint: Fix them up in the work tree, and then use 'git add/rm ' T12:26:58.869Z - error: `git merge master` exited with an unexpected code: 128.Įrror: Merging is not possible because you have unmerged files. T12:26:51.734Z - info: : Refreshing sidebar indicators for 5 repositories took 7.0s of which 0.0s paused, total 7.0s T12:26:49.984Z - info: Executing getStatus: git -no-optional-locks status -untracked-files=all -branch -porcelain=2 -z (took 1.761s) T12:26:47.083Z - info: Action 'stash and checkout' for 'definitely-nobody-is-here/BattleBoxes_Multiplayer' took 5.161s T12:26:46.150Z - info: Executing getStatus: git -no-optional-locks status -untracked-files=all -branch -porcelain=2 -z (took 1.458s)
Github desktop merge code#
T12:26:43.531Z - info: a stash was popped successfully but exit code 1 reported. (The error was parsed as 37: Unable to switch branches as there are working directory changes which would be overwritten. Please commit your changes or stash them before you switch branches. T12:26:42.167Z - error: `git -c credential.helper= -c protocol.version=2 checkout -progress the-aniket-branch -` exited with an unexpected code: 1.Įrror: Your local changes to the following files would be overwritten by checkout: T12:26:41.922Z - info: account found for repository: BattleBoxes_Multiplayer - definitely-nobody-is-here (has token) T12:26:40.277Z - info: Action 'checkout branch from list' for 'definitely-nobody-is-here/BattleBoxes_Multiplayer' took 0.000s T12:26:25.351Z - info: account found for repository: ev3rt-hrp2-sdk - definitely-nobody-is-here (has token) T12:26:20.186Z - info: execPath: 'C:\Users\jacki\AppData\Local\GitHubDesktop\app-2.8.1\GitHubDesktop.exe' T12:26:19.721Z - info: found account: definitely-nobody-is-here (Radioactive64)
T12:26:19.720Z - info: loading 6 repositories from store
0 kommentar(er)
