Option to merge instead of rebase; option to use desktop notifications as well as echo for errors #11
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nor “merge”; also, added option and functionality for error messages to be desktop notifications as well as echo messages (that should’ve been its own branch, I know)
|
Hi Tina, I would like to see your changes added. There are two issues however; one you mention. It should have been two commits (not branches, or at least not neccessarily). The other is a bunch of whitespace changes that do not contribute to functionality and introduce whitespace errors. I can work with what you provided but if you clean it yourself up I would be grateful. |
|
Ah, and a bit of documentation would be great. Not everybody enjoys reading prolonged bash. |
|
I would like to see this get into the git-sync script. Any objections to me taking a stab at a revised PR? @simonthum? @TinaRussell? |
|
Not at all! Just go ahead please. |
simonthum
force-pushed
the
master
branch
2 times, most recently
from
da4bfff to
668e8a8
Compare
|
Closing for lack of progress. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The new option “gitSyncMethod” defaults to “rebase,” but you can set it to “merge” for the script to merge instead of rebase when repositories have diverged.
Another new option, “syncUseNotify,” defaults to “false,” while “true” means that all error messages will be sent to notify-send as well as echo.
These should’ve been two separate branches, I know. (I’m… new at this.)