Skip to content

Instantly share code, notes, and snippets.

@AlexWang-16

AlexWang-16/rebase-conflicts.txt Secret

Created April 25, 2018 06:32
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save AlexWang-16/06e9c2c0d503e812c1134940988547b7 to your computer and use it in GitHub Desktop.
Save AlexWang-16/06e9c2c0d503e812c1134940988547b7 to your computer and use it in GitHub Desktop.
Download ZIP
Brave issue-13897
Raw
rebase-conflicts.txt
Date: Wed Apr 4 19:41:49 2018 -0400
2 files changed, 38 insertions(+), 4 deletions(-)
Auto-merging app/renderer/components/preferences/paymentsTab.js
CONFLICT (content): Merge conflict in app/renderer/components/preferences/paymentsTab.js
Auto-merging app/renderer/components/preferences/payment/ledgerRecovery.js
error: could not apply 0a2d04502... Ensuring that about:preferences#payments is maintained as the open page when a wallet recovery is successful, and when it is cancelled or closed out of.
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 0a2d04502... Ensuring that about:preferences#payments is maintained as the open page when a wallet recovery is successful, and when it is cancelled or closed out of.
~/dev/browser-laptop git rebase --skip
Auto-merging js/about/preferences.js
Auto-merging app/renderer/components/preferences/paymentsTab.js
CONFLICT (content): Merge conflict in app/renderer/components/preferences/paymentsTab.js
error: could not apply 7f194c987... Using the History API to remove visibility parameters from the current entry
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 7f194c987... Using the History API to remove visibility parameters from the current entry
~/dev/browser-laptop git rebase --skip
Auto-merging test/unit/lib/urlutilTest.js
CONFLICT (content): Merge conflict in test/unit/lib/urlutilTest.js
error: could not apply 689c890a9... Enhance muon unit test runner, include more unit tests
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 689c890a9... Enhance muon unit test runner, include more unit tests Auditors:
~/dev/browser-laptop git rebase --skip
CONFLICT (modify/delete): test/unit/runMuonCompatibleTests.js deleted in HEAD and modified in 26455ad0e... Convert siteSuggestionsTest to muon-compatible. Version 26455ad0e... Convert siteSuggestionsTest to muon-compatible of test/unit/runMuonCompatibleTests.js left in tree.
CONFLICT (modify/delete): test/unit/lib/urlutilTestComponents.js deleted in HEAD and modified in 26455ad0e... Convert siteSuggestionsTest to muon-compatible. Version 26455ad0e... Convert siteSuggestionsTest to muon-compatible of test/unit/lib/urlutilTestComponents.js left in tree.
Auto-merging test/unit/lib/urlutilTest.js
CONFLICT (content): Merge conflict in test/unit/lib/urlutilTest.js
CONFLICT (modify/delete): test/muon-native/index.js deleted in HEAD and modified in 26455ad0e... Convert siteSuggestionsTest to muon-compatible. Version 26455ad0e... Convert siteSuggestionsTest to muon-compatible of test/muon-native/index.js left in tree.
Auto-merging test/misc-components/muonTest.js
CONFLICT (content): Merge conflict in test/misc-components/muonTest.js
Auto-merging js/muonTest.entry.js
CONFLICT (content): Merge conflict in js/muonTest.entry.js
error: could not apply 26455ad0e... Convert siteSuggestionsTest to muon-compatible
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 26455ad0e... Convert siteSuggestionsTest to muon-compatible
~/dev/browser-laptop git rebase --skip
CONFLICT (modify/delete): test/unit/lib/urlutilTestComponents.js deleted in HEAD and modified in b12773687... Fix formatting. Version b12773687... Fix formatting of test/unit/lib/urlutilTestComponents.js left in tree.
error: could not apply b12773687... Fix formatting
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b12773687... Fix formatting
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment