AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |
Back to Blog
Rebase with smartgit12/7/2023 ![]() ![]() ![]() * | aaaaaaaa (#1381) get_export_list: bug-fix * | aaaaaaaa (#1381) Minor function renaming. * | aaaaaaaa (#1381) toml files included in setup-scripts ![]() * | aaaaaaaa (#1381) Improved handling of L0 files * | aaaaaaaa (#1381) facilitating new object_spec | * aaaaaaaa (#1381) meta handling clean-up | * aaaaaaaa (#1381) Style and format cleanup for readability | | * aaaaaaaa (#1381) Reworked logic to omit use of sys.exit() | | * aaaaaaaa (#1381) Putting cmems_delay function on hold. | | * aaaaaaaa (#1381) get_export_list: bug-fix | | * aaaaaaaa (#1381) Minor function renaming. | | * aaaaaaaa (#1381) Fixed bug in sql-db | * aaaaaaaa Merge branch 'github/1381' into origin/github/1381 | * aaaaaaaa (#1381) toml files included in setup-scripts | * aaaaaaaa (#1381) Improved handling of L0 files | * aaaaaaaa (#1381) facilitating new object_spec * aaaaaaaa Merge remote-tracking branch 'origin/github/1381' into github/1381 * aaaaaaaa (#1381) Facilitating change in directory structure * aaaaaaaa (#1381) General clean-up and improved SQL-functionality * aaaaaaaa (#1381) Removing bad use of try:except statements * aaaaaaaa (#1381) Removing stray debugging * aaaaaaaa (#1381) Making local_folder global variable, and minor bug-fixes * aaaaaaaa (#1381) Added export-date to CMEMS export database * aaaaaaaa (#1381) Added delete folder functionality * aaaaaaaa (HEAD -> github/1381_bak, origin/github/1381_bak) (# 1381) index file added to gitignore Git log gives something like (Replaced commit hashes): $ git log -graph -decorate -oneline To abort and get back to the state before "git rebase", run "git rebase -abort". You can instead skip this commit: run "git rebase -skip". "git add/rm ", then run "git rebase -continue". Resolve all conflicts manually, mark them as resolved with Use 'git am -show-current-patch' to see the failed patch #local_folder = filepath_local.rsplit('/',1)įalling back to patching base and 3-way merge.Īuto-merging WebApp/WebContent/resources/python/export/py_func/copernicus.pyĬONFLICT (content): Merge conflict in WebApp/WebContent/resources/python/export/py_func/copernicus.py git/rebase-apply/patch:33: trailing whitespace. M WebApp/WebContent/resources/python/export/py_func/copernicus.py Using index info to reconstruct a base tree. nc files in ignore-listĪpplying: Added monthly index-file and stations rtf to gitignoreĪpplying: Reformat using Eclipse formatting rulesĪpplying: (#1386) Remove panelGrid warning on login pageĪpplying: (#1378) Apply replacement column headers on exportĪpplying: (#1381) facilitating new object_spec The reason for doing the rebase -i was to clean up an issue where the same commits had been applied twice after som other rebase/force push mess (i guess), and the rebase got a conflict on the first commit that was applied for the second time (with a different commit hash, and some whitespace changes).įirst, rewinding head to replay your work on top of it.Īpplying: Cherrypicking python files to commit to masterĪpplying: (#1379) Included. Today, however, I was demonstrating git rebase -i to a colleague, and i first did git rebase 63c1e126, where 63c1e126 was a commit picked from the commit log, and the rebase failed with a conflict. This puzzles me: Usually git rebase HEAD^^^^^^^ simply states that: ![]()
0 Comments
Read More
Leave a Reply. |