ankurbag / my-important-links

0 stars 0 forks source link

Reverting the merge #4

Open ankurbag opened 7 years ago

ankurbag commented 7 years ago

ankur.bag@ABAG-1 MINGW64 /c/repos/server (fix-master) $ git revert --m=0 07240c8d9 error: commit 07240c8d99bf8f5b59521fe2bf1f9b6e112c730a is a merge but no -m option was given. fatal: revert failed

ankur.bag@ABAG-1 MINGW64 /c/repos/server (fix-master) $ git revert --m=ae3cef11e 07240c8d9 error: option `mainline' expects a numerical value usage: git revert [] ... or: git revert

--quit                end revert or cherry-pick sequence
--continue            resume revert or cherry-pick sequence
--abort               cancel revert or cherry-pick sequence
-n, --no-commit       don't automatically commit
-e, --edit            edit the commit message
-s, --signoff         add Signed-off-by:
-m, --mainline <n>    parent number
--rerere-autoupdate   update the index with reused conflict resolution if possible
--strategy <strategy>
                      merge strategy
-X, --strategy-option <option>
                      option for merge strategy
-S, --gpg-sign[=<key-id>]
                      GPG sign commit

ankur.bag@ABAG-1 MINGW64 /c/repos/server (fix-master) $ git revert -m 1 07240c8d9 [fix-master b44d69e32] Revert "Merge pull request #847 in MVAAS/server from MVAAS-2964-add-unique-id-s-for-elements-on to master" 4 files changed, 3 insertions(+), 18 deletions(-)

ankur.bag@ABAG-1 MINGW64 /c/repos/server (fix-master) $ git revert -m 1 ae3cef11e [fix-master ca0a8c9f0] Revert "Merge pull request #837 in MVAAS/server from feature/MVAAS-1406-webclient-create-and-manage-contacts to master" 19 files changed, 4 insertions(+), 877 deletions(-) delete mode 100644 Client/app/actions/contacts.js delete mode 100644 Client/app/components/ContactForm/ContactForm.js delete mode 100644 Client/app/components/ContactsTable/ContactsTable.js delete mode 100644 Client/app/components/ContactsTable/styles.css delete mode 100644 Client/app/containers/UserContent/ContactsContainer.js delete mode 100644 Client/app/reducers/contactReducer.js