jbyoshi / gitupdate Goto Github PK

This would only occur if Git can automatically merge them. I'd need a way to detect what branch to add, though, and whether to merge or rebase.

I'd also like to handle rebasing submodules, but JGit doesn't seem to provide a way to get the old and new commits from a rebase.

Steps to reproduce:

• Check out a branch.
• Push some changes in a file.
• Go back to an older version and make some other, conflicting changes in the file.
• Run GitUpdate.

Note: Not all of these may be useful to add; I just copied the list from the type hierarchy.

• AbortedByHookException
• CanceledException
• CannotDeleteCurrentBranchException
• CheckoutConflictException
• ConcurrentRefUpdateException
• DetatchedHeadException
• InvalidConfigurationException
• InvalidMergeHeadsException
• InvalidRebaseStepException
• InvalidRefNameException
• InvalidRemoteException
• InvalidTagNameException
• MultipleParentsNotAllowedException
• NoFilepatternException
• NoHeadException
• NoMessageException
• NotMergedException
• PatchApplyException
• PatchFormatException
• RefAlreadyExistsException
• RefNotAdvertisedException
• RefNotFoundException
• StashApplyFailureException
• TransportException
• TooLargePackException
• UnmergedPathsException
• ArchiveCommand.UnsupportedFormatException
• WrongRepositoryStateException

This will allow me to support quite a few new features with minimal work - git worktree, remote.pushdefault, etc, which would help with #5.

When SpongeAPI is a submodule of SpongeCommon, SpongeCommon is updated before SpongeAPI.

Git Update should try to fast-forward branches to their remote-tracking branches.