Squashing commits - Revision history

Ndp: /* What can go wrong */

2020-12-23T22:33:40Z

What can go wrong

← Older revision		Revision as of 22:33, 23 December 2020
Line 91:		Line 91:

	== What can go wrong ==		== What can go wrong ==
	If you get scared and bail out of the editor with the 'pick' etc., lines, you'll be stuck in 'rebase mode.' You can use 'git rebase --continue' or 'git rebase --abort' to get out of that state and continue or abort.
			;Conflicts
			If you try to squash a single commit and git rebase get's grumpy like:
			[-bash: ~/OPeNDAP/hyrax/bes] git rebase --interactive ffad8f66b806e2f2c90de79bec2fa6efb7d2e00b
			Auto-merging dispatch/AllowedHosts.cc
			CONFLICT (content): Merge conflict in dispatch/AllowedHosts.cc
			error: could not apply 2820cf541... Repairs AllowedHosts::is_allowed() unsigned to signed conversion issue
			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 2820cf541... Repairs AllowedHosts::is_allowed() unsigned to signed conversion issue
			[-bash: ~/OPeNDAP/hyrax/bes]
			I had a look at AllowedHosts.cc, found the typical git merge marks <<<<<< etc. I resolved the conflict, ran added AllowedHosts.cc cat to the git stage and tried again:

			[-bash: ~/OPeNDAP/hyrax/bes] git add dispatch/AllowedHosts.cc
			[-bash: ~/OPeNDAP/hyrax/bes] git rebase --continue
			[detached HEAD 812a17b81] Repairs AllowedHosts::is_allowed() unsigned to signed conversion issue
			1 file changed, 1 insertion(+), 1 deletion(-)
			Auto-merging modules/dmrpp_module/DmrppArray.h
			Auto-merging modules/dmrpp_module/DmrppArray.cc
			CONFLICT (content): Merge conflict in modules/dmrpp_module/DmrppArray.cc
			error: could not apply a383e908f... Migrated DmrppArray::read_chunks() to c++11 threads
			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 a383e908f... Migrated DmrppArray::read_chunks() to c++11 threads
			[-bash: ~/OPeNDAP/hyrax/bes]
			This time the merge conflict was an epic train wreck and a I bailed:
			[-bash: ~/OPeNDAP/hyrax/bes] git rebase --abort

			;Abort Rebase
			:If you get scared and bail out of the editor with the 'pick' etc., lines, you'll be stuck in 'rebase mode.' You can use 'git rebase --continue' or 'git rebase --abort' to get out of that state and continue or abort.

Ndp: /* How */

2020-11-16T23:16:31Z

How

← Older revision		Revision as of 23:16, 16 November 2020
Line 5:		Line 5:

	== How ==		== How ==
	First, while you're on your branch, use 'git log' to find the commit hash for the commit right before the first commit of ~~you~~ branch. In the git log output below (which has some stuff elided) it has the info (origin/master, master). Copy the first 8 or so characters of that commit hash.		First, while you're on your branch, use 'git log' to find the commit hash for the commit right before the first commit of your branch. In the git log output below (which has some stuff elided) it has the info (origin/master, master). Copy the first 8 or so characters of that commit hash.

	<nowiki>[nori:hello_world jimg$] git log		<nowiki>[nori:hello_world jimg$] git log

Jimg: /* How */

2020-11-16T18:05:39Z

How

← Older revision		Revision as of 18:05, 16 November 2020
Line 79:		Line 79:
	[nori:hello_world jimg$]</nowiki>		[nori:hello_world jimg$]</nowiki>

	But... This won't work to push to GitHub because git will want us to pull first. To ~~for~~ the push, don't use `--force` but instead use this magic: 'git push origin +hack'. Yes, the magic is to include the word 'origin' and to use a plus sign, '+hack'. That will look like:		But... This won't work to push to GitHub because git will want us to pull first. To force the push, don't use `--force` but instead use this magic: 'git push origin +hack'. Yes, the magic is to include the word 'origin' and to use a plus sign, '+hack'. That will look like:

	<nowiki>[nori:hello_world jimg$] git push origin +hack		<nowiki>[nori:hello_world jimg$] git push origin +hack

Jimg: /* Squashing Commits of a branch to make things tidy */

2020-09-30T19:17:06Z

Squashing Commits of a branch to make things tidy

@@ Line 1: / Line 1: @@
 = Squashing Commits of a branch to make things tidy =
   <nowiki>[nori:hello_world jimg$] git log
@@ Line 9: / Line 15: @@
      Merge branch 'hack' of https://github.com/jgallagher59701/hello into hack
-commit de1b5fee05159d4a0ba35a189f12e94ba71dfe70
+ ...
 commit e6239975aaa6bf18d44a113873100df48d46087e
@@ Line 39: / Line 29: @@
      Initial commit</nowiki>
-Use 'git rebase --interactive f1302d5f3'
+Now, use 'git rebase --interactive f1302d5f3'
 Which will show (in the Git EDITOR):
@@ Line 89: / Line 79: @@
 [nori:hello_world jimg$]</nowiki>
-But... This won't work to push to GitHub because git will want us to pull first. To for the push, don't use `--force` but instead use this magic: 'git push origin +hack'. Yes, the magic is to include the word 'origin' and to use a plus sign, '+hack'.
+But... This won't work to push to GitHub because git will want us to pull first. To for the push, don't use `--force` but instead use this magic: 'git push origin +hack'. Yes, the magic is to include the word 'origin' and to use a plus sign, '+hack'. That will look like:

Jimg at 19:06, 30 September 2020

2020-09-30T19:06:19Z

← Older revision		Revision as of 19:06, 30 September 2020
Line 38:		Line 38:

	Initial commit</nowiki>		Initial commit</nowiki>

			Use 'git rebase --interactive f1302d5f3'

			Which will show (in the Git EDITOR):

			<nowiki>pick e623997 Added an error.
			pick 19c0052 Comments
			pick de1b5fe Namespace finagling
			pick 1037dfa Namespace finaggling

			# Rebase f1302d5..48a898d onto f1302d5 (4 commands)
			#
			# Commands:
			# p, pick = use commit
			# r, reword = use commit, but edit the commit message
			# e, edit = use commit, but stop for amending
			# s, squash = use commit, but meld into previous commit
			# f, fixup = like "squash", but discard this commit's log message
			# x, exec = run command (the rest of the line) using shell
			# d, drop = remove commit
			#
			# These lines can be re-ordered; they are executed from top to bottom.
			#
			# If you remove a line here THAT COMMIT WILL BE LOST.
			#
			# However, if you remove everything, the rebase will be aborted.
			#
			# Note that empty commits are commented out</nowiki>

			Change the 'pick' word to 'squash'

			<nowiki>pick e623997 Added an error.
			squash 19c0052 Comments
			squash de1b5fe Namespace finagling</nowiki>

			Now we have:

			<nowiki>[nori:hello_world jimg$] git log
			commit 94eba834437908e738f80c80403d2e95a6f11fe2 (HEAD -> hack)
			Author: James Gallagher <jgallagher@opendap.org>
			Date: Wed Sep 30 12:37:40 2020 -0600

			Added an error.

			commit f1302d5f3549937ddc770b06e7316fc11e5079ae (origin/master, master)
			Author: James Gallagher <jgallagher@opendap.org>
			Date: Wed Sep 30 12:32:19 2020 -0600

			Initial commit
			[nori:hello_world jimg$]</nowiki>

			But... This won't work to push to GitHub because git will want us to pull first. To for the push, don't use `--force` but instead use this magic: 'git push origin +hack'. Yes, the magic is to include the word 'origin' and to use a plus sign, '+hack'.

Jimg: Created page with "= Squashing Commits of a branch to make things tidy = [nori:hello_world jimg$] git log commit 48a898d0830fbf8a795204993bbd572b83e6557c (HEAD -> hack, origin/hack) Me..."

2020-09-30T18:50:46Z

Created page with "= Squashing Commits of a branch to make things tidy = <nowiki>[nori:hello_world jimg$] git log commit 48a898d0830fbf8a795204993bbd572b83e6557c (HEAD -> hack, origin/hack) Me..."

New page

= Squashing Commits of a branch to make things tidy =

<nowiki>[nori:hello_world jimg$] git log
commit 48a898d0830fbf8a795204993bbd572b83e6557c (HEAD -> hack, origin/hack)
Merge: de1b5fe 1037dfa
Author: James Gallagher <jgallagher@opendap.org>
Date: Wed Sep 30 12:40:34 2020 -0600

Merge branch 'hack' of https://github.com/jgallagher59701/hello into hack

commit de1b5fee05159d4a0ba35a189f12e94ba71dfe70
Author: James Gallagher <jgallagher@opendap.org>
Date: Wed Sep 30 12:39:13 2020 -0600

Namespace finagling

commit 1037dfa76b3bd8785b79f6f7a973209692f125a3
Author: James Gallagher <jgallagher@opendap.org>
Date: Wed Sep 30 12:39:13 2020 -0600

Namespace finaggling

commit 19c0052fea1162145d4ae483fc7cf07e61a244ab
Author: James Gallagher <jgallagher@opendap.org>
Date: Wed Sep 30 12:38:08 2020 -0600

Comments

commit e6239975aaa6bf18d44a113873100df48d46087e
Author: James Gallagher <jgallagher@opendap.org>
Date: Wed Sep 30 12:37:40 2020 -0600

Added an error.

commit f1302d5f3549937ddc770b06e7316fc11e5079ae (origin/master, master)
Author: James Gallagher <jgallagher@opendap.org>
Date: Wed Sep 30 12:32:19 2020 -0600

Initial commit</nowiki>