How to skip "Loose Object" popup when running 'git gui'

When I run 'git gui' I get a popup that says This repository currently has approximately 1500 loose objects. It then suggests compressing the database. I've done this before, and it reduces...

Change old commit message using `git rebase`

I was trying to edit an old commit message as explained here. The thing is that now, when I try to run rebase -i HEAD~5 it says interactive rebase already started. So then I try: git rebase...

Can "git pull --all" update all my local branches?

I often have at least 3 remote branches: master, staging and production. I have 3 local branches that track those remote branches. Updating all my local branches is tedious: git fetch --all git...

Git rebase will not continue after a delete/modify conflict

I'm in the middle of a rebase of my master to a stage branch git checkout stage git rebase master At some time I deleted two files then modified the two files according to GIT. warning: too many...

Rebasing remote branches in Git

I am using an intermediate Git repository to mirror a remote SVN repository, from which people can clone and work on. The intermediate repository has it's master branch rebased nightly from the...

How to prevent many git conflicts when rebasing many commits?

Story: in the middle of a project my colleague created a new branch from master and started doing her heavy re-factoring work. I created my branch from master and started doing new stuff on the...

Change branch base

I've a tree like this: (commit 1) - master \-- (commit 2) - (commit 3) - demo \-- (commit 4) - (commit 5) - PRO and I have to move...

Why do I have to resolve the same "git rebase" conflict over and over?

When I do git rebase branch1 in my branch1-local I get conflicts. I solve the conflict, do git add <conflicted-add> and then do git rebase --continue as git asks me to do. After that a new commit...

What does the "at" @ sign/symbol/character mean in Git?

The at-sign @ is often used in git to specify revisions in different ways. For example, <ref>@{<date>} specifies the reference at its state on <date>. Example: git diff [email protected]{yesterday}...

Using IPython notebooks under version control

What is a good strategy for keeping IPython notebooks under version control? The notebook format is quite amenable for version control: if one wants to version control the notebook and the outputs...

Completely cancel a rebase

I performed a rebase like this: git rebase --onto master new_background_processing export_background_processing That didn't do what I wanted it to, so I performed a reset: git reset --hard...

Git: How to squash all commits on branch

I make new branch from master with: git checkout -b testbranch I make 20 commits into it. Now I want to squash those 20 commits. I do that with: git rebase -i HEAD~20 What about if I don't...

How to disable pull requests in GitHub?

I am trying to understand how will I be able to disable "pull requests" in github. Question 1: We are trying to use the rebase workflow and that means using pull requests can be harmful if that...

What are the best practices for having git clean history?

Reading about git workflows, I was wondering about the appropriateness of history rewriting. My workflow, and I imagine that of many others, is this: Take Github repository, let's call this...

How to use Visual Studio Code as Default Editor for Git

When using git at the command line, I am wondering if it is possible to use Visual Studio Code as the default editor, i.e. when creating commit comments, and looking at a diff of a file from the...

Why does the same conflict reappear when I use git rebase?

I have read relevant questions about git merge and git rebase on SO, but I still cannot fully understand what is happening under the hood. Here is our branching...

Git refusing to merge unrelated histories on rebase

During git rebase origin/development the following error message is shown from Git: fatal: refusing to merge unrelated histories Error redoing merge 1234deadbeef1234deadbeef My Git version is...

Remove duplicate commits introduced after bad rebase(s)

I have 2 branches, master & feature. Master occasionally receives small tweaks that are needed to go live quickly. Once these tweaks are done, master is rebased into feature so that feature is...

What algorithm is used during "git rebase"?

I can't find an explanation of how git does a rebase internally. The most frequent answer is about applying patches on a base commit but I don't see how it can be true, because there's no way to...

Git how to rollback a rebase

In Git, how do you rollback a rebase if you're not happy with it? Git doesn't have dry-run for rebase. If I did a rebase and have not pushed it yet, how do I rollback to before, as if it never happened?

A faster way to `git rebase --preserve-merges`

I use git by creating a series of feature branches, and merging them to master when they're done with git merge --no-ff. This creates empty merge commits useful to identify start and end points of...

How to remove an unpushed outgoing commit in Visual Studio?

I accidentally pushed a staged change in a new branch in Visual Studio 2017 to my local repository. It hasn't been pushed to the remote repository. I want to get rid of it but can't find a way to...

Propagate nixpkgs checkout to NixOps machines

I'm maintaining my personal changes on nixpkgs, which I use both for system rebuilds (via NixOps) and for development on my workstation (mostly via nix-shell). The changes are commits rebased...

How to repair after git rebase was interrupted

I am trying to merge branch feedback with master, using "git checkout feedback" and "git rebase master". While performing the rebase, the computer power turned off, interrupting the process. Now...

How to deal with this git warning? "Pulling without specifying how to reconcile divergent branches is discouraged"

After a git pull origin master I get the following message: warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of...

java.lang.NoSuchMethodException: android.content.res.Resources$Theme.rebase []

After I set minifyEnabled true, I got this error in my released app Any idea how to solve it? 2020-07-01 11:51:33.651 30098-30098/? I/ResourcesCompat: Failed to retrieve rebase() method ...

git interactive rebase - edit vs break

I've tried googling this but wasn't able to find a satisfactory answer. I'd like to know what the difference is between edit and break in the interactive mode of git rebase -i. According to the...

Pull request shows old commits after rebase/merge to another branch in azure devops

We are trying to adapt Skullcandy git flow - link In short the flow is: Feature branch is rebranched from master After work on the feature is finished code is rebased/merged to QA branch were it...

How to merge using go-git?

Since merge and rebase are currently not implemented, what's the recommended way to merge changes from another branch into your active branch using go-git? For example, suppose our master branch...

Problems when writing parquet with timestamps prior to 1900 in AWS Glue 3.0

When switching from Glue 2.0 to 3.0, which means also switching from Spark 2.4 to 3.1.1, my jobs start to fail when processing timestamps prior to 1900 with this error: An error occurred while...